merge of '6014a9321bb2362ffc628a351c1db19922384f76'

and 'd68b6ad6b4308d8dbe27d1faac089cb15358bfa2'
This commit is contained in:
str4d
2012-08-07 12:24:33 +00:00

View File

@@ -17,10 +17,10 @@ _jsp\.java$
\.war$ \.war$
\.zip$ \.zip$
^\. ^\.
^build/ ^build
^pkg-temp/ ^pkg-temp/
~$ ~$
/build/ /build
/classes/ /classes/
^debian/copyright ^debian/copyright
override.properties override.properties