Merge

2010-05-08 15:31:47 +02:00 · 2010-05-08 15:31:47 +02:00 · a76de6adc1
commit a76de6adc1
parent e77d7dab27 f646190cb0
2 changed files with 22 additions and 0 deletions
--- a/.hgignore
+++ b/.hgignore
@ -16,6 +16,9 @@ release
 test
 Temp

+# NeL cache
+*.packed_sheets
+
 # Windows compile
 *.exe
 *.dll
@ -26,6 +29,7 @@ Temp
 *.a
 *.la
 *.o
+*_debug

 # Log dump files
 report_refused
@ -40,6 +44,24 @@ log.txt
 *.dlm
 *.dlu

+# Linux garbage
+Makefile.in
+aclocal.m4
+config.guess
+config.sub
+configure
+depcomp
+nelconfig.h.in
+install-sh
+ltmain.sh
+missing
+ylwrap
+*.config
+*.creator
+*.files
+*.includes
+*.mk
+
 # Visual Studio garbage
 *.opensdf
 UpgradeLog*.XML
--- a/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings_r.exp
+++ b/code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings_r.exp