From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Tue, 2 Oct 2012 05:07:02 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 0.12^2~19
X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=commitdiff_plain;h=51e6f03e54282c282d98da944049c7bbe4525e94;hp=278ab375b3c5b64a69af5abfe13ee6a0fe29da8e

Merge branch 'master' into next
---

diff --git a/pom.xml b/pom.xml
index b7cbad9..7302bb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>jSite</artifactId>
-	<version>0.11</version>
+	<version>0.11.1</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/de/todesbaum/jsite/main/Main.java b/src/main/java/de/todesbaum/jsite/main/Main.java
index 5e1e67a..8a4f905 100644
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@ -80,7 +80,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, 11);
+	private static final Version VERSION = new Version(0, 11, 1);
 
 	/** The configuration. */
 	private Configuration configuration;