Viewing all changes in revision 115.
- Committer: Ted Gould
- Date: 2014-06-02 19:13:12 UTC
- mfrom: (111.1.39 trunk)
- Revision ID: ted@gould.cx-20140602191312-enc2ec0l44oyiv4c
Merge trunk
- files added:
- MERGE-REVIEW
- tests/click-db-dir
- tests/click-root-dir
- tests/click-root-dir/.click
- tests/click-root-dir/.click/users
- tests/click-root-dir/.click/users/test-user
- tests/click-root-dir/.click/users/test-user/com.test.bad-version
- tests/click-root-dir/.click/users/test-user/com.test.good
- tests/click-root-dir/.click/users/test-user/com.test.multiple
- tests/click-root-dir/.click/users/test-user/com.test.no-app
- tests/click-root-dir/.click/users/test-user/com.test.no-hooks
- tests/click-root-dir/.click/users/test-user/com.test.no-json
- tests/click-root-dir/.click/users/test-user/com.test.no-object
- tests/click-root-dir/.click/users/test-user/com.test.no-version
- tests/click-root-dir/com.test.bad-version
- tests/click-root-dir/com.test.bad-version/1.2.3
- tests/click-root-dir/com.test.good
- tests/click-root-dir/com.test.good/1.2.3
- tests/click-root-dir/com.test.multiple
- tests/click-root-dir/com.test.multiple/1.2.3
- tests/click-root-dir/com.test.no-app
- tests/click-root-dir/com.test.no-app/1.2.3
- tests/click-root-dir/com.test.no-hooks
- tests/click-root-dir/com.test.no-hooks/1.2.3
- tests/click-root-dir/com.test.no-json
- tests/click-root-dir/com.test.no-json/1.2.3
- tests/click-root-dir/com.test.no-object
- tests/click-root-dir/com.test.no-object/1.2.3
- tests/click-root-dir/com.test.no-version
- tests/click-root-dir/com.test.no-version/1.2.3
- tests/link-farm
- tools
- upstart-jobs
- files removed:
- desktop-single-trace.tp
- files renamed:
- data/com.canonical.UpstartAppLaunch.xml => data/com.canonical.UbuntuAppLaunch.xml
- debian/libupstart-app-launch2-dev.install => debian/libubuntu-app-launch2-dev.install
- debian/libupstart-app-launch2.install => debian/libubuntu-app-launch2.install
- debian/libupstart-app-launch2.symbols => debian/libubuntu-app-launch2.symbols
- debian/upstart-app-launch-tools.install => debian/ubuntu-app-launch-tools.install
- debian/upstart-app-launch.install => debian/ubuntu-app-launch.install
- libupstart-app-launch/ => libubuntu-app-launch/
- second-exec-core.c => libubuntu-app-launch/second-exec-core.c
- second-exec-core.h => libubuntu-app-launch/second-exec-core.h
- libupstart-app-launch/upstart-app-launch.c => libubuntu-app-launch/ubuntu-app-launch.c
- libupstart-app-launch/upstart-app-launch.h => libubuntu-app-launch/ubuntu-app-launch.h
- libupstart-app-launch/upstart-app-launch.pc.in => libubuntu-app-launch/ubuntu-app-launch.pc.in
- tests/upstart-app-launch-mock.c => tests/ubuntu-app-launch-mock.c
- tests/upstart-app-launch-mock.h => tests/ubuntu-app-launch-mock.h
- upstart-app-launch.c => tools/ubuntu-app-launch.c
- upstart-app-list.c => tools/ubuntu-app-list.c
- upstart-app-pid.c => tools/ubuntu-app-pid.c
- upstart-app-stop.c => tools/ubuntu-app-stop.c
- upstart-app-watch.c => tools/ubuntu-app-watch.c
- upstart-app-launch-desktop.click-hook.in => ubuntu-app-launch-desktop.click-hook.in
- application-click.conf.in => upstart-jobs/application-click.conf.in
- application-legacy.conf.in => upstart-jobs/application-legacy.conf.in
- application.conf.in => upstart-jobs/application.conf.in
- test-conffile.sh => upstart-jobs/test-conffile.sh
- files modified:
- .bzrignore
expand all
collapse all
added
removed
