Viewing all changes in revision 9.
- Committer: Victor Thompson
- Date: 2015-02-23 03:41:30 UTC
- mfrom: (1.3.10 reboot)
- Revision ID: victor.thompson@gmail.com-20150223034130-npd2oh8glfcnllnx
merge of trunk and resolve conflicts
- files added:
- app/ui/LocationPane.qml
- files modified:
- app/ubuntu-weather-app.qml
expand all
collapse all
added
removed
