Viewing all changes in revision 50.
- Committer: Victor Thompson
- Date: 2015-06-05 23:11:51 UTC
- mfrom: (48.1.1 reboot-manage-current-location)
- Revision ID: victor.thompson@gmail.com-20150605231151-1vrts01ktff0p0dg
Merge of prereq branch and resolve conflict.
- files added:
- tests/autopilot/ubuntu_weather_app/CMakeLists.txt
- tests/autopilot/ubuntu_weather_app/tests
- files modified:
- app/ui/AddLocationPage.qml
expand all
collapse all
added
removed
