Merge with 8ad8fa86c732fb484b503c17b381e1e59180a4cb
authorveltr
Thu, 10 May 2012 18:52:44 +0200
changeset 889 122fc46d7d4a
parent 886 ab69ff6fa02b (current diff)
parent 888 8ad8fa86c732 (diff)
child 891 a8896023a6f4
Merge with 8ad8fa86c732fb484b503c17b381e1e59180a4cb
.hgignore
--- a/.hgignore	Thu May 10 18:36:38 2012 +0200
+++ b/.hgignore	Thu May 10 18:52:44 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