summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorNils Schwabe2014-04-09 15:35:15 +0200
committerNils Schwabe2014-04-09 15:35:15 +0200
commit702b5d7ed1702791dbef88125c2e574d52246939 (patch)
treecff8d06a48faa3efb47c20fc220fb35bcff93042 /.gitignore
parentforgot to commit the ftpserver class (diff)
downloadmasterserver-702b5d7ed1702791dbef88125c2e574d52246939.tar.gz
masterserver-702b5d7ed1702791dbef88125c2e574d52246939.tar.xz
masterserver-702b5d7ed1702791dbef88125c2e574d52246939.zip
fixed config dir (examples etc)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d6fcdeb..75b963b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/.project
/.classpath
/config/mysql.properties
+/config/global.properties
/target
/src/main/java/org/openslx/imagemaster/thrift/iface
/gen-java