merge of '6014a9321bb2362ffc628a351c1db19922384f76'

and 'd68b6ad6b4308d8dbe27d1faac089cb15358bfa2'
2012-08-07 12:24:33 +00:00
parent 1ab8200c7f 3017e4f51a
commit 9c7f4cc604
1 changed files with 2 additions and 2 deletions
--- a/.mtn-ignore
+++ b/.mtn-ignore
@ -17,10 +17,10 @@ _jsp\.java$
 \.war$
 \.zip$
 ^\.
-^build/
+^build
 ^pkg-temp/
 ~$
-/build/
+/build
 /classes/
 ^debian/copyright
 override.properties