summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-30 06:52:59 +0900
committerkali <kali@leap.se>2013-01-30 06:52:59 +0900
commit570f84756b3d1f689a172a3ff0c55abf6a60b9dd (patch)
tree0f262acacf35743664c6408edbafe6ba6f119d14 /.gitignore
parente60abdcb796ad9e2c44e9b37d3a68e7f159c035c (diff)
parent10a2303fe2d21999bce56940daecb78576f5b741 (diff)
Merge branch 'pre-release-0.2.0' into release-0.2.0
This merge contains today's state of develop branch, minus soledad and email components.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c577e14f..a9b7c1c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
*.swp
*.swo
*.pyc
+*.log
.*
+!.coveragerc
+!.tx
bin/
build/
core
@@ -12,11 +15,13 @@ docs/covhtml
include/
lib/
local/
-man/
share/
src/leap.egg-info/
src/leap_client.egg-info
src/leap/_branding.py
src/leap/certs/*.pem
src/*.egg-info
+pkg/osx/dist
+pkg/osx/build
MANIFEST
+_trial_temp*