Merge branch 'mavenize' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 28 Aug 2012 08:52:01 +0000 (10:52 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 28 Aug 2012 08:52:01 +0000 (10:52 +0200)
commit9e6e70c28963fde2a6c8b120974f8a70d4da25bc
tree57d93eaa9d29521ba70689fb8ed97623e17611fb
parent8bc7a8f2372639a9fbeea34f9cbee9697f34ba3f
parentea076c18c3ebebc991f4075320a1db9bdba543c9
Merge branch 'mavenize' into next
14 files changed:
src/main/java/de/todesbaum/jsite/application/KeyDialog.java
src/main/java/de/todesbaum/jsite/application/Project.java
src/main/java/de/todesbaum/jsite/application/ProjectInserter.java
src/main/java/de/todesbaum/jsite/application/UpdateChecker.java
src/main/java/de/todesbaum/jsite/gui/FileScanner.java
src/main/java/de/todesbaum/jsite/gui/NodeManagerPage.java
src/main/java/de/todesbaum/jsite/gui/PreferencesPage.java
src/main/java/de/todesbaum/jsite/gui/ProjectFilesPage.java
src/main/java/de/todesbaum/jsite/gui/ProjectInsertPage.java
src/main/java/de/todesbaum/jsite/gui/ProjectPage.java
src/main/java/de/todesbaum/jsite/i18n/I18nContainer.java
src/main/java/de/todesbaum/jsite/main/CLI.java
src/main/java/de/todesbaum/jsite/main/Main.java
src/main/java/de/todesbaum/jsite/main/Version.java