summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <gkiagia@tolabaki.gr>2016-12-02 17:42:36 +0200
committerGeorge Kiagiadakis <gkiagia@tolabaki.gr>2016-12-02 17:42:36 +0200
commitfa0024095423db9f0f5bf236b9794de096033867 (patch)
treed85f829c44351c13c663be5a5af4cf4120fa7140 /.gitignore
parent3d516218007a5f029932ffc85138a1f620553f1b (diff)
parentdb079b0e18e3acef8ce27deec60e39706b0a6ef1 (diff)
Merge branch 'telepathy-gabble-0.18'HEADmaster
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bb2a5bed8..bba1b7a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,14 @@
*.gcno
*.gcov
*.l[ao]
+*.log
*.loT
*.orig
*.pc
*.py[co]
*.rej
*.sw[op]
+*.trs
*~
*#
.#*
@@ -103,3 +105,4 @@ cscope.out
/tests/twisted/tools/with-session-bus-*.bustle-logs
/tests/twisted/with-session-bus-*.address
/tests/twisted/with-session-bus-*.pid
+/tools/telepathy-glib-env