summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Nathan Samson <nathansamson@gmail.com>2011-09-04 22:15:55 +0200
committerGravatar Nathan Samson <nathansamson@gmail.com>2011-09-04 22:15:55 +0200
commit6b075e0339f419555f08ece3a6c4a29407ecc32b (patch)
treec8c9df6d8690edddec8da8f8f3a87123f86dead0 /.gitignore
parentc4514b062a9866153c179d4b6ecf7972c9496891 (diff)
parentaab4d593bdbffef8442282318778a9833cbc7a43 (diff)
downloadsubsurface-6b075e0339f419555f08ece3a6c4a29407ecc32b.tar.gz
Merge hbonse's UI tweaks, but fixing the compile warnings. Also bringing it up to date with the master (and my own UI improvements)
Signed-off-by: Nathan Samson <nathansamson@gmail.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 295ea6b17..aeb949b3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
*.o
-/parse
+/divelog