← Back to branch summary

~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration

~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration

Viewing all changes in revision 75.

Committer: Victor Thompson
Date: 2015-09-25 01:35:30 UTC
mfrom: (56.1.71 ubuntu-weather-app)
Revision ID: victor.thompson@gmail.com-20150925013530-wk8q2cox35uknpko

Merge and resolve conflicts.

files added:
app/components/NetworkErrorStateComponent.qml

po/am.po

po/sr.po

files modified:
app/components/DayDelegateExtraInfo.qml

app/components/SettingsButton.qml

app/ubuntu-weather-app.qml

app/ui/AddLocationPage.qml

app/ui/HomePage.qml

app/ui/LocationPane.qml

app/ui/LocationsPage.qml

debian/changelog

po/br.po

po/cs.po

po/de.po

po/en_GB.po

po/es.po

po/fi.po

po/fr.po

po/gl.po

po/hu.po

po/it.po

po/nb.po

po/nl.po

po/pl.po

po/pt.po

po/ru.po

po/sv.po

po/uk.po

po/uz.po

po/vi.po

po/zh_CN.po

po/zh_TW.po

tests/autopilot/ubuntu_weather_app/__init__.py

tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py

tests/autopilot/ubuntu_weather_app/tests/test_home_page.py

tests/autopilot/ubuntu_weather_app/tests/test_migration.py

tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py

Show diffs side-by-side

added added

removed removed

app/components/DayDelegateExtraInfo.qml

app/components/NetworkErrorStateComponent.qml

app/components/SettingsButton.qml

app/ubuntu-weather-app.qml

app/ui/AddLocationPage.qml

app/ui/HomePage.qml

app/ui/LocationPane.qml

app/ui/LocationsPage.qml

debian/changelog

tests/autopilot/ubuntu_weather_app/__init__.py

tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py

tests/autopilot/ubuntu_weather_app/tests/test_home_page.py

tests/autopilot/ubuntu_weather_app/tests/test_migration.py

tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py

Older »