Sampo Niskanen 82af205e3e Merge remote-tracking branch 'upstream/master' into feature/simulationextensions ...

Conflicts:
	core/src/net/sf/openrocket/simulation/SimulationStatus.java

2014-12-23 21:01:48 +02:00

..

componenticons

Moving pix/ into resources/.

2012-01-11 03:23:49 +00:00

eventicons

Moving pix/ into resources/.

2012-01-11 03:23:49 +00:00

icon

Moving pix/ into resources/.

2012-01-11 03:23:49 +00:00

icons

Merge remote-tracking branch 'upstream/master' into feature/simulationextensions

2014-12-23 21:01:48 +02:00

spheres

Moving pix/ into resources/.

2012-01-11 03:23:49 +00:00

translators

Update zh_CN translation & logo

2014-09-26 15:13:45 +10:00

splashscreen.png

Update splashscreen copyright

2013-04-16 22:50:17 +03:00