Sampo Niskanen 487da3a3fc Merge remote-tracking branch 'upstream/master' into feature/scripting ...

Conflicts:
	swing/.settings/org.eclipse.jdt.core.prefs

2015-01-10 18:44:55 +02:00

..

.settings

Start using Java 1.7.

2015-01-09 21:33:16 -06:00

lib

Add script editor highlighting using RSyntaxTextArea

2014-12-27 20:20:32 +02:00

reference

Update to MigLayout 4.0.

2013-11-11 09:51:53 -06:00

resources/datafiles

Update example design of simulation extensions

2015-01-07 17:59:43 +02:00

resources-src/datafiles

Upon further research the estes nc data contained incorrect PNC-80FB

2014-04-23 15:15:38 -05:00

src/net/sf/openrocket

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

2015-01-10 18:44:55 +02:00

test/net/sf/openrocket

Added build.xml driver in root directory. Moved a few files around to support

2013-09-30 11:38:54 -05:00

.classpath

Add script editor highlighting using RSyntaxTextArea

2014-12-27 20:20:32 +02:00

.gitignore

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

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

.project

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

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

build.xml

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

2015-01-10 18:44:55 +02:00