Merge with 122fc46d7d4acad1126e8a4b67fcf9ea0cd268d0
authorcavaliet
Fri, 11 May 2012 13:48:06 +0200
changeset 891 a8896023a6f4
parent 890 3fcc0d2f2641 (current diff)
parent 889 122fc46d7d4a (diff)
child 892 07682bfa6078
Merge with 122fc46d7d4acad1126e8a4b67fcf9ea0cd268d0
--- a/.hgignore	Fri May 11 13:45:43 2012 +0200
+++ b/.hgignore	Fri May 11 13:48:06 2012 +0200
@@ -10,4 +10,10 @@
 doc/jsdoc/*
 
 syntax: regexp
-^assets/player_bab_ldt/player_bab_ldt/bin$
\ No newline at end of file
+^assets/player_bab_ldt/player_bab_ldt/bin$
+syntax: regexp
+^test/metadataplayer$
+syntax: regexp
+^test/libs$
+syntax: regexp
+^build/LdtPlayer-core\.js$
\ No newline at end of file