diff options
| author | kali <kali@leap.se> | 2012-08-10 00:45:07 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-08-10 00:45:07 +0900 |
| commit | d6e46003c8164c0030b67efaccc2b25643f5d20b (patch) | |
| tree | 7fe200a60f0d1fdfd900c98d4c70e40c857efb32 | |
| parent | b06e938d688c89bfb4529ff593672e726403e152 (diff) | |
| parent | 0ed6e5db8a7109bd558ade054284362bb21d8944 (diff) | |
Merge branch 'develop' into upstreamupstream
Conflicts:
.gitattributes
| -rw-r--r-- | .gitattributes | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 5966153..3622284 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,18 @@ -.gitattributes export-ignore -.gitignore export-ignore +*.swp export-ignore +*.swo export-ignore +*.pyc export-ignore +.* export-ignore +bin/ export-ignore +build/ export-ignore +core export-ignore +debian/python-leap-client/ export-ignore +dist/ export-ignore +docs/_build export-ignore +docs/covhtml export-ignore +include/ export-ignore +lib/ export-ignore +local/ export-ignore +man/ export-ignore +share/ export-ignore +src/leap.egg-info/ export-ignore +src/leap_client.egg-info export-ignore |