Merge branch 'develop' of https://bitbucket.org/rapidpm/rapidpm into develop

svenruppert · svenruppert · commit 638a7a3c1bbf · 2013-04-09T20:33:21.000+02:00
# By Marco Ebbinghaus # Via Marco Ebbinghaus * 'develop' of https://bitbucket.org/rapidpm/rapidpm: .gitignore angepasst (und zwar: rebel.xml aus dem webgui-modul eingetragen)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea/workspace.xml
 out/*
 target
+webgui/src/main/resources/rebel.xml

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .idea/workspace.xml
 out/*
 target
 +webgui/src/main/resources/rebel.xml