Merge branch 'master' into win32-x64-working

2015-05-03 09:01:46 -04:00
parent 5dfc98bc6a 181740e874
commit 8ebf5b1759
10 changed files with 117 additions and 75 deletions
--- a/util/.gitignore
+++ b/util/.gitignore
@@ -1,13 +1,19 @@
-dgn_yacc.c
 dgn_lex.c
-makedefs
-tilemap
-dgn_comp
+dgn_yacc.c
 lev_lex.c
 lev_yacc.c
-tile2x11
+tiletxt.c
+makedefs
+dgn_comp
 lev_comp
-tileedit
-tile2bmp
 dlb
 recover
+tilemap
+tileedit
+tile2x11
+tile2bmp
+tile2beos
+gif2txt
+txt2ppm
+tile2img.ttp
+xpm2ppm.ttp