diff options
author | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
commit | b1a2ec9a672d6f097d56d039d164918508f72ceb (patch) | |
tree | 0e259ada6c41b5e660f2e64188238acf4594f140 /.gitignore | |
parent | 4951157e3740b42ecef6775c8927b912a6ee8870 (diff) | |
parent | 9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff) |
Merge branch 'master' into debian
Conflicts:
pkg/requirements.pip
setup.py
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -8,6 +8,7 @@ ui_*.py !.coveragerc !.tx +!.gitattributes bin/ build/ core @@ -18,15 +19,12 @@ include/ lib/ local/ share/ -src/leap/util/reqs.txt -src/leap.egg-info/ -src/leap_client.egg-info -src/leap/_branding.py -src/leap/certs/*.pem -src/*.egg-info -src/pysqlcipher pkg/osx/dist pkg/osx/build + +src/*.egg-info +src/pysqlcipher +src/leap/bitmask/util/reqs.txt MANIFEST _trial_temp* config/* |