Kevin Ruland 4b4a7c74fc Merge remote-tracking branch 'upstream/master' into unstable ...

Conflicts:
	swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java

2016-04-02 16:49:15 -05:00

..

database

[Refactor ] Refactored motor state in preparation for debugging the simulation itself

2016-03-11 19:13:28 -05:00

file/motor

Rework source structure to separate swing gui code from core code.

2013-09-27 11:34:46 -05:00

gui

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

2016-04-02 16:49:15 -05:00

logging

Store the formatted log message, with "{}"s substituted.

2014-02-01 17:15:50 -05:00

simulation/extension

Fine-tune UI

2015-01-07 17:37:14 +02:00

startup

Work around reported bug concerning TimSort and comparators violating

2015-09-12 06:37:06 -05:00

utils

[Minor] Cleaned up warnings

2016-01-17 11:58:06 -05:00