version 1.1.0

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@52 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/ChangeLog b/ChangeLog
index 9a642d1959d464ec4ec5f1b7007a6a7cc57dcf9c..4404b9ca9e27beb455bc61b75b062521aebf21f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-21  Sampo Niskanen
+
+       * Released version 1.1.0
+
+2010-03-20  Doug Pedrick
+
+       * [BUG] Fixed RockSim design material loading
+
 2010-03-20  Sampo Niskanen
 
        * Minor enhancements to the logging system

diff --git a/README.TXT b/README.TXT
index a9d6d6f0f7983b0db826873d9f52d8b6d8c4bb7f..54084d7763907a92b7f7498d7a93074e8078e65b 100644 (file)
--- a/README.TXT
+++ b/README.TXT
@@ -18,3 +18,12 @@ To start the software run the class
 or from the JAR file run
 
     $ java -jar OpenRocket-<VERSION>.jar
+
+
+
+Contributions have been made by:
+--------------------------------
+
+Sampo Niskanen, main developer
+Doug Pedrick, support for reading RockSim designs
+

diff --git a/ReleaseNotes b/ReleaseNotes
index 596a411a5fb69a53d719d976a35b4b9edc663a06..a72db2e66101d4cbf0183dc9e8d117b17b753ff0 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,10 @@
+OpenRocket 1.1.0  (2010-03-21):
+-------------------------------
+
+Support for loading RockSim rocket design files (.rkt) thanks to
+Doug Pedrick.
+
+
 OpenRocket 1.0.0  (2010-03-10):
 -------------------------------
 

diff --git a/build.properties b/build.properties
index 1bc4ac31552343bc1c796f471efe61176ae880fd..1bb030aca055620495d4d88c2549b4eac4db0769 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 
 # The OpenRocket build version
 
-build.version=1.1.0pre
+build.version=1.1.0
 
 
 # The source of the package.  When building a package for a specific

diff --git a/dists/OpenRocket-1.1.0-src.zip b/dists/OpenRocket-1.1.0-src.zip
new file mode 100644 (file)
index 0000000..73aa664
Binary files /dev/null and b/dists/OpenRocket-1.1.0-src.zip differ

diff --git a/dists/OpenRocket-1.1.0.jar b/dists/OpenRocket-1.1.0.jar
new file mode 100644 (file)
index 0000000..563c48f
Binary files /dev/null and b/dists/OpenRocket-1.1.0.jar differ