summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-23 10:29:20 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-23 10:29:20 -0300
commite85fbf156ba5ed3e24da6d92e8d021fe6fd9037d (patch)
tree4ba5d052fbee53703241bb5efee2a66f4d4578b3 /.gitignore
parent0347bf68d394118460566c8cd5cd49c75b0825f7 (diff)
parenta2d40aefb8ef2b0892ed87b38ddef96ddaf1dcc7 (diff)
Merge remote-tracking branch 'kali/feature/improve_packaging' into develop
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