aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2015-03-30 08:13:02 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2015-03-30 08:13:02 +0200
commitd56b15fa56c87ade91c23b6082a52ebaa9ea529b (patch)
treed1d1c5dd5365be9929de5002745d4c73f223e78a
parent954e0d148d2e6cc0d0e8d57cb8d4d1e8fc197103 (diff)
downloadusdx-d56b15fa56c87ade91c23b6082a52ebaa9ea529b.tar.gz
usdx-d56b15fa56c87ade91c23b6082a52ebaa9ea529b.tar.xz
usdx-d56b15fa56c87ade91c23b6082a52ebaa9ea529b.zip
.gitignore cleanup
-rw-r--r--.gitignore52
-rw-r--r--test/.gitignore4
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