Billy Olsen 31f52cec18 Add missing change from resolution of merge ...

Missed a change resolving merges for PhotoPanel.java

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>

2021-08-14 20:52:09 -07:00

..

.settings

[upgrade] Updated Eclipse buildfiles to use Java 1.8

2018-06-17 15:34:55 -04:00

lib

[rm] remove duplicate jogl jar

2020-07-19 16:05:24 -04:00

reference

Update to MigLayout 4.0.

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

resources/datafiles

Resize space.jpg for display

2021-02-23 13:19:35 -07: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

Add missing change from resolution of merge

2021-08-14 20:52:09 -07:00

test/net/sf/openrocket

The deleted methods (setTotalThrustEstimate(), setBurnTimeEstimate(), setAverageThrustEstimate(), and setMaxThrustEstimate()) were never called. The member variables maxThrust, burnTimeEstimate, averageThrust, totalImpulse are all calculated by computeStatistics() and the values (if any) from the thrustcurve file are ignored.

2020-04-22 09:29:57 -06:00

.classpath

Adjust IntelliJ and Eclipse classpaths to new guice

2020-04-02 19:22:42 -07: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

Update guice library to remove AOP; Fixes issue #609

2020-04-02 15:56:55 -07:00

OpenRocket Swing.iml

Adjust .iml files for IntelliJ

2020-04-05 12:36:07 -07:00