summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-11-06 12:18:28 -0500
committerMicah Anderson <micah@riseup.net>2013-11-06 12:18:28 -0500
commit77a807841485c31ced87431fe7004491a97eba97 (patch)
tree70549ac6d77f882277439b559296f2085abc5da7 /.gitignore
parent127e4b422c9e4a7c01d41fe1dbff9714fe36c5dd (diff)
parent82ef2326e93d2a0b621dc44974af7279ee42dfb2 (diff)
Merge branch 'leap_master'
Conflicts: debian/changelog debian/control
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f470bdd..c9bfcb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ debian/*.log
debian/*.debhelper
debian/*.substvars
debian/python-srp/*
+.pc