From: plaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sun, 21 Mar 2010 10:12:13 +0000 (+0000)
Subject: version 1.1.0
X-Git-Tag: upstream/1.1.0~2^2~2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=98626c685bd2b80f084af0a49dddce33f03fec90;p=debian%2Fopenrocket

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 9a642d19..4404b9ca 100644
--- 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 a9d6d6f0..54084d77 100644
--- 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 596a411a..a72db2e6 100644
--- 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 1bc4ac31..1bb030ac 100644
--- 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
index 00000000..73aa664c
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
index 00000000..563c48ff
Binary files /dev/null and b/dists/OpenRocket-1.1.0.jar differ