ref: dac0a54debcb1ec2e894970e14766bf46f654132
parent: f19bd8638ee329da200f9ce138c36136b6fef0ff
parent: 61ff35c18185ff1a919b24b1dc5559aa4f1aee84
author: C Nelson <[email protected]>
date: Tue Apr 17 16:38:35 EDT 2012
Merge remote-tracking branch 'upstream/master'
--- /dev/null
+++ b/.gitignore
@@ -1,0 +1,30 @@
+#precompiled python
+*.pyc
+
+#compiled object file
+*.o
+
+#no binaries
+*.exe
+
+#roms
+*.gbc
+
+#generated
+*.tx
+
+#swap files for vim
+.*.swp
+
+#no data from extras/
+extras/*.json
+
+#for any of the poor souls with save game files in their working directory
+baserom.sgm
+baserom.sav
+pokered.sgm
+pokered.sav
+
+#for vim configuration
+#url: http://www.vim.org/scripts/script.php?script_id=441
+.lvimrc
--- a/.hgignore
+++ /dev/null
@@ -1,32 +1,0 @@
-syntax: glob
-
-#precompiled python
-*.pyc
-
-#compiled object file
-*.o
-
-#no binaries
-*.exe
-
-#roms
-*.gbc
-
-#generated
-*.tx
-
-#swap files for vim
-.*.swp
-
-#no data from extras/
-extras/*.json
-
-#for any of the poor souls with save game files in their working directory
-baserom.sgm
-baserom.sav
-pokered.sgm
-pokered.sav
-
-#for vim configuration
-#url: http://www.vim.org/scripts/script.php?script_id=441
-.lvimrc