Viewing all changes in revision 60.
- Committer: Victor Thompson
- Date: 2015-07-25 21:53:40 UTC
- mfrom: (57.2.8 reboot)
- Revision ID: victor.thompson@gmail.com-20150725215340-tld7g2rm4ns3grpk
Merge and resolve conflicts
- files added:
- AUTHORS
- 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:
- CMakeLists.txt
expand all
collapse all
added
removed
