diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-15 20:57:50 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-15 20:57:50 +0100 |
| commit | c8db874b6bf27dead411d6f83c504f2bb40fd1fd (patch) | |
| tree | dd0bee41a6c7dfb15684fa4f3104787e89f3ac30 /.gitignore | |
| parent | 0901a0a6c90e24621e35ac35e5cd88fa20c2a205 (diff) | |
| parent | c4bb262c3209c172bf0ab2455a1cc4f8a14a1583 (diff) | |
Merge branch 'telepathy-mission-control-5.4'
Conflicts:
src/mcd-account-manager.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -10,6 +10,7 @@ *.bak *.gcda *.gcno +*.gcov /doc/reference/*/html /doc/reference/*/xml /doc/reference/*/*-decl-list.txt @@ -82,6 +83,8 @@ test/twisted/tools/missioncontrol-*.log test/twisted/tools/tmp-session-bus.conf /test/twisted/tools/*.service /test/twisted/tmp-*/ +/test/twisted/with-session-bus-*.address +/test/twisted/with-session-bus-*.pid /util/mc-account-convert /util/mc-tool /util/mc-wait-for-name |