diff --git a/.idea/artifacts/openrocket_jar.xml b/.idea/artifacts/openrocket_jar.xml index 7d3ff7107..a16c14544 100644 --- a/.idea/artifacts/openrocket_jar.xml +++ b/.idea/artifacts/openrocket_jar.xml @@ -31,7 +31,7 @@ - + diff --git a/core/.classpath b/core/.classpath index 163c5b1c5..7941ba5c1 100644 --- a/core/.classpath +++ b/core/.classpath @@ -19,7 +19,7 @@ - + diff --git a/core/OpenRocket Core.iml b/core/OpenRocket Core.iml index b09b9bb82..a8c052fd8 100644 --- a/core/OpenRocket Core.iml +++ b/core/OpenRocket Core.iml @@ -128,7 +128,7 @@ - + @@ -261,4 +261,4 @@ - \ No newline at end of file + diff --git a/core/lib/guice-4.2.1.jar b/core/lib/guice-4.2.1.jar deleted file mode 100644 index 91ed389ab..000000000 Binary files a/core/lib/guice-4.2.1.jar and /dev/null differ diff --git a/core/lib/guice-4.2.3-no_aop.jar b/core/lib/guice-4.2.3-no_aop.jar new file mode 100644 index 000000000..811d7793a Binary files /dev/null and b/core/lib/guice-4.2.3-no_aop.jar differ diff --git a/swing/.classpath b/swing/.classpath index 2c99a421f..24ceba058 100644 --- a/swing/.classpath +++ b/swing/.classpath @@ -22,7 +22,7 @@ - + diff --git a/swing/OpenRocket Swing.iml b/swing/OpenRocket Swing.iml index 18aa7a5ea..d95de30ef 100644 --- a/swing/OpenRocket Swing.iml +++ b/swing/OpenRocket Swing.iml @@ -172,15 +172,6 @@ - - - - - - - - - @@ -245,5 +236,14 @@ + + + + + + + + + - \ No newline at end of file + diff --git a/swing/build.xml b/swing/build.xml index f790ac82e..d74eba620 100644 --- a/swing/build.xml +++ b/swing/build.xml @@ -93,7 +93,7 @@ - +