aboutsummaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-11-24 16:40:47 -0600
committerTed Gould <ted@gould.cx>2009-11-24 16:40:47 -0600
commitacbab334ce6b9cef6d80c94d29aac7fb35534b4d (patch)
treecd5cbf08a4b4a6acd7c4d6b31d91f36ce805e996 /.bzrignore
parent4b23fc39d2fed996dd651d101dc1fb0a5b76d8f0 (diff)
parentf23c54ff5fee5587c31ecb8bf176b58fa3d4be1d (diff)
downloadlibayatana-appindicator-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.gz
libayatana-appindicator-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.bz2
libayatana-appindicator-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.zip
Merging in changes on trunk. Resolving a conflict.
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index ca8d63a..672bbfe 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -36,3 +36,4 @@ example/.deps
example/.libs
example/simple-client
src/libcustom_la-custom-service-marshal.lo
+tests/libcustomindicator-tests-gtester