Merge branch 'master' into next

diff --git a/src/de/todesbaum/jsite/application/UpdateChecker.java b/src/de/todesbaum/jsite/application/UpdateChecker.java
index 201c8b9..c49f166 100644 (file)
--- a/src/de/todesbaum/jsite/application/UpdateChecker.java
+++ b/src/de/todesbaum/jsite/application/UpdateChecker.java
@@ -51,7 +51,7 @@ public class UpdateChecker implements Runnable {
        private static int counter = 0;
 
        /** The edition for the update check URL. */
-       private static final int UPDATE_EDITION = 11;
+       private static final int UPDATE_EDITION = 17;
 
        /** The URL for update checks. */
        private static final String UPDATE_KEY = "USK@e3myoFyp5avg6WYN16ImHri6J7Nj8980Fm~aQe4EX1U,QvbWT0ImE0TwLODTl7EoJx2NBnwDxTbLTE6zkB-eGPs,AQACAAE";

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index c2841d0..edbf5e4 100644 (file)
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -79,7 +79,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        private static final Logger logger = Logger.getLogger(Main.class.getName());
 
        /** The version. */
-       private static final Version VERSION = new Version(0, 9, 2);
+       private static final Version VERSION = new Version(0, 10);
 
        /** The configuration. */
        private Configuration configuration;