diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
| commit | 95daf102dac37a69686f8a86bf7fe47cd442c7d6 (patch) | |
| tree | 3891a7075873c6eeb320fe0c8a572ca14655f5af /.bzrignore | |
| parent | 4f4190f71f8495e5bcf6779d73157931572e42ac (diff) | |
| parent | 1cf6a9761db8beefc8d2a73c2cf9903264424c66 (diff) | |
| download | libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.gz libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.bz2 libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.zip | |
"bzr merge lp:indicator" + conflict resolution in tests suite
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -172,3 +172,12 @@ libindicator/s-enum-types-h libindicator/gen-indicator-service.xml.c libindicator/gen-indicator-service.xml.h libindicator/libindicator_la-gen-indicator-service.xml.lo +libindicator/indicator-0.4.pc.in +libindicator/indicator3-0.4.pc +libindicator/indicator3-0.4.pc.in +libindicator/libindicator3_la-gen-indicator-service.xml.lo +tools/indicator-loader3 +libindicator-[0-9]*.[0-9]*.[0-9]* +build-aux +libdummy_indicator_entry_func_la-dummy-indicator-entry-func.lo +libdummy-indicator-entry-func.la |