summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-03-28 01:45:00 +0100
committerSven Gothel <[email protected]>2010-03-28 01:45:00 +0100
commit9e8ba29142d83d5749fc9650715019fef3539b1d (patch)
tree9062b73c85c4facf9011b357fbda2b1195eb23a2 /.gitignore
parent2dc67e8f8faeb418061e0dd450b37d4cb3ce4c2f (diff)
parentea23f9505e3fcf3a5b928855eba739ad123b64f4 (diff)
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 378eac25d..6e3af642b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
build
+javadoc_public
+build-temp
+make/temp*
+.idea/workspace.xml
+**~ \ No newline at end of file