← Back to branch summary

~om26er/camera-app/fix_autopilot_test_code

~om26er/camera-app/fix_autopilot_test_code

Viewing all changes in revision 232.

Committer: Omer Akram
Date: 2013-11-22 11:04:58 UTC
mfrom: (225.1.5 camera-app)
Revision ID: om26er@ubuntu.com-20131122110458-kgb8r6ibxa8syxjx

fix conflicts, merge trunk

files added:
po/az.po

po/ml.po

tests/autopilot/camera_app/tests/test_gallery_integration.py

files modified:
debian/control

po/ar.po

po/ast.po

po/ca.po

po/cs.po

po/de.po

po/en_AU.po

po/en_GB.po

po/es.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/hy.po

po/id.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lo.po

po/lv.po

po/my.po

po/pl.po

po/pt_BR.po

po/ru.po

po/shn.po

po/sl.po

po/sv.po

po/ta.po

po/tr.po

po/uk.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

tests/autopilot/camera_app/emulators/main_window.py

tests/autopilot/camera_app/tests/test_focus.py

Show diffs side-by-side

added added

removed removed

tests/autopilot/camera_app/emulators/main_window.py

tests/autopilot/camera_app/tests/test_focus.py

tests/autopilot/camera_app/tests/test_gallery_integration.py

Older »