# HG changeset patch
# User veltr
# Date 1336668764 -7200
# Node ID 122fc46d7d4acad1126e8a4b67fcf9ea0cd268d0
# Parent  ab69ff6fa02bd2d82ba511b25d4534ed41f2cd28# Parent  8ad8fa86c732fb484b503c17b381e1e59180a4cb
Merge with 8ad8fa86c732fb484b503c17b381e1e59180a4cb

diff -r ab69ff6fa02b -r 122fc46d7d4a .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