summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorBlueRaja <BlueRaja.admin@gmail.com>2013-12-10 00:10:01 -0600
committerBlueRaja <BlueRaja.admin@gmail.com>2013-12-10 00:10:01 -0600
commit26f3579496defdd4e56c6479db84030e34b67077 (patch)
tree2d089bbd598a663cf1810e303edc36f7c0df5c69 /.gitignore
parent803edcca15b66b4e93f9fc0ca19779488e7e3b3d (diff)
parent651715e5db3cbe3f6c41fadfb89960793ae5620c (diff)
downloadpathery-26f3579496defdd4e56c6479db84030e34b67077.tar.xz
Merge branch 'master' of git.raylu.net:pathery
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index adf26e9..cbcc3d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
/motdLockFile
/nbproject/private/
-/favicon.ico \ No newline at end of file
+/favicon.ico
+/emailLockFile
+
+/.dropbox
+/desktop.ini