← Back to branch summary

~allanlesage/address-book-app/abook_navigation_favorites

~allanlesage/address-book-app/abook_navigation_favorites

Viewing all changes in revision 148.

Committer: Allan LeSage
Date: 2014-02-13 17:25:02 UTC
mfrom: (125.2.9 address-book-app)
Revision ID: allan.lesage@canonical.com-20140213172502-77wenj1et96kno72

Merged trunk, resolving conflicts (test passing).

files added:
data/address-book-app.url-dispatcher

po/br.po

po/km.po

po/ug.po

files modified:
data/CMakeLists.txt

debian/address-book-app.install

debian/changelog

tests/autopilot/address_book_app/emulators/main_window.py

tests/autopilot/address_book_app/tests/__init__.py

tests/autopilot/address_book_app/tests/test_add_contact.py

tests/autopilot/address_book_app/tests/test_edit_contact.py

Show diffs side-by-side

added added

removed removed

data/CMakeLists.txt

data/address-book-app.url-dispatcher

debian/address-book-app.install

debian/changelog

tests/autopilot/address_book_app/emulators/main_window.py

tests/autopilot/address_book_app/tests/__init__.py

tests/autopilot/address_book_app/tests/test_add_contact.py

tests/autopilot/address_book_app/tests/test_edit_contact.py

Older »