summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-07-09 18:28:39 -0400
committerirungentoo <irungentoo@gmail.com>2013-07-09 18:28:39 -0400
commit116f7b20eff8a487c1f74cdcd2469236f5e13be0 (patch)
treec82ba4c55bdc698a68614bb9056169d5bf7b8766 /.gitignore
parentae6f898a9ef0c046ada8558b7142be2643f9b4c0 (diff)
parentaad063f62a7d852943620f39c82ac4fa144d8bda (diff)
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index f7500447..d7ca164d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
1
2.DS_Store 1.DS_Store
2.travis.yml
3 3
4//nacl build
5nacl/build/