kruland2607 58e5874832 Merge remote-tracking branch 'upstream/master' into sims ...

Conflicts:
	core/src/net/sf/openrocket/gui/main/SimulationPanel.java

2013-06-11 21:25:33 -05:00

..

de/congrace/exp4j

fixed ~150 build warnings

2012-12-16 00:12:44 -08:00

META-INF/services

moving to core/

2012-01-08 02:24:44 +00:00

net/sf/openrocket

Merge remote-tracking branch 'upstream/master' into sims

2013-06-11 21:25:33 -05:00