2 files changed, 26 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore
index 037161e7..f4d77ba3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,26 @@
-Thumbs.db
-.svn
-*.orig
-*.dcu
-*.ppu
-*.rst
-*.compiled
-*.or
-*.d
-*.o
-*.a
-*.exe
-*.dll
-*.identcache
-*.bdsproj.local
-*.bak
-*~
-config.log
-config.status
-__history
-aclocal.m4
-autom4te.cache/
-coverage/
-usdx
-debug.log
-debug.log.*
+# editor stuff
+*~
+\#*\#
+*.swp
+*.bak
+
+# binary
+usdx
+
+# logs
+debug.log*
+
+# tests
+test/usdx-test
+test/usdx-test-coverage
+test/coverage/
+test/test.xml
+
+# cmake stuff
+CMakeFiles/
+Testing/
+CMakeCache.txt
+cmake_install.cmake
+CTestTestfile.cmake
+DartConfiguration.tcl
+Makefile
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index 09352468..00000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-usdx-tests
-usdx-tests-coverage
-test.xml
-.error