add rule to merge from firemind

2014-08-17 10:11:51 +08:00 · 2014-08-17 10:11:51 +08:00 · ecc5e3fbb1
parent df3e6109d0
commit ecc5e3fbb1
1 changed files with 6 additions and 0 deletions
--- a/6
+++ b/6
@ -738,3 +738,9 @@ parse_missing.txt:
 	rm release/Magarena/scripts
 	mv release/Magarena/scripts-curr release/Magarena/scripts
 	patch -p1 -R < parse_missing.patch
+
+firemind:
+	hg pull firemind
+	hg merge
+	hg commit -m "merge cards from firemind"
+	make normalize_files checks debug