compilation fix after incorrectly resolved conflict

[wxWidgets.git] / .cvsignore

diff --git a/.cvsignore b/.cvsignore
index 982c36f56d3d0a8f3fdd722c659dd52668bfaad0..8a34bd320582ed703dbfcf7f66904df68e865225 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,6 +3,7 @@ bin
 .gdb_history
 Test
 config.cache
+configarg.cache
 config.status
 system.list
 linux.system.cache
@@ -17,16 +18,18 @@ linux-gnu.system.cache
 *.ncb
 *.pro
 *.opt
+*.d
+*.swp
+*.swo
 Release
 Debug
 ReleaseDLL
 DebugDLL
 robert
-Makefile.in
-setup.h.in
 stamp-h.in
 Makefile
 configure
 setup.h
 stamp-h
 libtool
+aclocal.m4