Viewing all changes in revision 62.3.2.
- Committer: Victor Thompson
- Date: 2015-07-25 21:09:37 UTC
- mfrom: (63 reboot)
- mto: This revision was merged to the branch mainline in revision 64.
- Revision ID: victor.thompson@gmail.com-20150725210937-i2z68465zsjh8ois
Merge and resolve conflict
- files added:
- README.autopilot
- tests/autopilot/ubuntu_weather_app/databases
- tests/autopilot/ubuntu_weather_app/files
- files removed:
- tests/autopilot/ubuntu_weather_app/tests/test_weather.py
- files modified:
- app/ui/HomePage.qml
expand all
collapse all
added
removed
