summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorHector Martin <hector@marcansoft.com>2009-08-20 03:42:52 +0200
committerHector Martin <hector@marcansoft.com>2009-08-20 06:51:10 +0200
commit1a0c58e4062da7db73b4c08963f741cf016f6aa5 (patch)
treeb250f094e978d48622ecf652e28e9f3b68873893 /.gitignore
parentf4854f3fd725b5ba49cd5157d941783cffa08c04 (diff)
parent79ca4d9a3c3a82bb5a3f9be1ac7a2533c7a89b05 (diff)
downloadusbmuxd-1a0c58e4062da7db73b4c08963f741cf016f6aa5.tar.gz
Merge the two development histories
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b25c15b..0784410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
*~
+build
+