diff options
| author |  Nathan Samson <nathansamson@gmail.com> | 2011-09-04 19:06:47 +0200 |
|---|---|---|
| committer | Nathan Samson <nathansamson@gmail.com> | 2011-09-04 19:06:47 +0200 |
| commit | bcf12edfe9f9f00d39736d1cff791dbe8809f6f1 (patch) | |
| tree | 4505541929893b0d244fdb8aa72c5b915febd920 /.gitignore | |
| parent | 6138d151e9156bdf15843b1b54104428c5124e38 (diff) | |
| parent | 23a6607ae7ce9335be736c3400e4b8d77744af16 (diff) | |
| download | subsurface-bcf12edfe9f9f00d39736d1cff791dbe8809f6f1.tar.gz | |
Merge branch 'master' into ui-improvements
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
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 |