summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-12-02 14:44:57 -0400
committerKali Kaneko <kali@leap.se>2015-12-02 14:44:57 -0400
commit24f2bb2b4cef60598ca5e924eb7e3788929daaae (patch)
treec3ccd6238bd7d51332e7377880beb08de016ed07 /.gitignore
parent80b80d34818840ea60f57c4580db19527dd4ea0c (diff)
parent0226ccbc7a8b43e5d8ea9825a5a9aebb6c0c5755 (diff)
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 98a55cf..13783ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ debian/leap-mx.postrm.debhelper
debian/leap-mx.prerm.debhelper
debian/leap-mx.substvars
debian/leap-mx/
+_trial_temp