diff options
author | Conor Curran <conor.curran@canonical.com> | 2011-07-11 11:58:39 +0100 |
---|---|---|
committer | Conor Curran <conor.curran@canonical.com> | 2011-07-11 11:58:39 +0100 |
commit | 1b43dcb34eab345b4046258c478c02e536cf44d8 (patch) | |
tree | fa061ab29fa5809ffe08713c21ff78de5c9b1887 /.bzrignore | |
parent | 4f535763d9e05e41c81b1a8fbf262aea1246f616 (diff) | |
parent | 331ab6a0abc53276af8da99ea141071bbb605820 (diff) | |
download | ayatana-indicator-session-1b43dcb34eab345b4046258c478c02e536cf44d8.tar.gz ayatana-indicator-session-1b43dcb34eab345b4046258c478c02e536cf44d8.tar.bz2 ayatana-indicator-session-1b43dcb34eab345b4046258c478c02e536cf44d8.zip |
merged trunk to keep up with changes
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -47,9 +47,8 @@ src/status-provider-telepathy-marshal.h src/status-provider-mc5-marshal.c src/status-provider-mc5-marshal.h data/indicator-session.schemas -src/users-service-client.h -src/users-service-marshal.c -src/users-service-marshal.h +src/accounts-service-client.h +src/accounts-service-user-client.h indicator-session-[0-9].[0-9].[0-9].tar.gz indicator-session-[0-9].[0-9].tar.gz indicator-session-[0-9].[0-9].[0-9].tar.gz.asc @@ -58,5 +57,5 @@ src/consolekit-manager-client.h src/gen-session-dbus.xml.c src/gen-session-dbus.xml.h src/upower-client.h -src/gdm-local-display-factory-client.h +src/display-manager-client.h src/consolekit-session-client.h |