Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / ChangeLog

diff --git a/core/ChangeLog b/core/ChangeLog
index 87738415eca73f3d0c550eed155bc390ee54156d..7f0fa6f74761b491245fee72af141e047ccff011 100644 (file)
--- a/core/ChangeLog
+++ b/core/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-28 Bill Kuker
+
+   * Removed late GL initialization, was causing issues with Java 7.
+   
+   * Added -Dopenrocket.3d.disable option for anyone experiencing crashes as a result of OpenGL.
+
 2012-08-01 Kevin Ruland
 
    * Changed the loader to pull *.rkt files from zip containers.
@@ -7,12 +13,6 @@
    * Unified the behavior for replacing (automatically closing) the base frame when opening a file, loading an example,
    or picking from the Most-recently-used list.
 
-2012-07-31 Kevin Ruland
-
-   * Changed the ORK file format to save "keys" for materials and flight data as well as the localized
-   names.  This allows, for example, file saved in english locale to be loaded in a german locale
-   and have all the references established correctly.
-
 2012-06-24  Bill Kuker
 
     * OSX UI Elements: Screen menu bar, Application name, Dock Icon, Quit, About & Preference