# HG changeset patch
# User cavaliet
# Date 1336736886 -7200
# Node ID a8896023a6f406484e2be3c9746ed6f88379c996
# Parent  3fcc0d2f2641cd0397a7e9eb772dbe0ed5758e1e# Parent  122fc46d7d4acad1126e8a4b67fcf9ea0cd268d0
Merge with 122fc46d7d4acad1126e8a4b67fcf9ea0cd268d0

diff -r 3fcc0d2f2641 -r a8896023a6f4 .hgignore
--- 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