summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKali Kaneko <kali@futeisha.org>2013-08-27 19:51:51 +0200
committerKali Kaneko <kali@futeisha.org>2013-08-27 19:51:51 +0200
commit53295c63dcee0a6a2824d18854326470b086545f (patch)
tree6d6a0a7b585d61475417373798fe5440b139c9da /.gitignore
parent50b2cf99130f92d2ab4b12373116c6ca896f1a81 (diff)
parentc091267cb8191a8e23c352063113729cb7fb3cb1 (diff)
Merge branch 'master' into debian
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b0f9a13..18bfcd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
ui_*.py
!.coveragerc
!.tx
+!.gitattributes
bin/
build/
core