« back to all changes in this revision
Viewing changes to com.ubuntu.weather_weather.desktop.in.in
- Committer: Martin Borho
- Date: 2014-02-15 14:31:10 UTC
- mfrom: (187.1.10 trunk)
- Revision ID: martin@borho.net-20140215143110-gij32mdfm2mah342
merged from trunk, resolved conflict
- files added:
- CMakeLists.txt
- click
- doc
- tests/autopilot/ubuntu_weather_app/files
- files removed:
- apparmor
- files renamed:
- apparmor/weather.json => click/apparmor.json
- manifest.json => click/manifest.json.in
- ubuntu-weather-app.desktop => com.ubuntu.weather_weather.desktop.in.in
- po/ubuntu-weather-app.pot => po/com.ubuntu.weather.pot
- ubuntu-weather-app => ubuntu-weather-app.in
- files modified:
- .bzrignore
added
removed
com.ubuntu.weather_weather.desktop.in.in
