← Back to branch summary

~daker/webbrowser-app/fix.1212980

~daker/webbrowser-app/fix.1212980

Viewing all changes in revision 316.

Committer: Adnane Belmadiaf
Date: 2013-09-20 15:46:38 UTC
mfrom: (313.1.3 fix.1212980)
Revision ID: daker@ubuntu.com-20130920154638-achznksxf04912s3

Fixed merge conflicts

files modified:
debian/changelog

po/ar.po

po/ca.po

po/cs.po

po/da.po

po/de.po

po/el.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/hu.po

po/hy.po

po/it.po

po/ja.po

po/ko.po

po/lv.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt_BR.po

po/ru.po

po/shn.po

po/sl.po

po/sr.po

po/sv.po

po/tr.po

po/uk.po

po/uz.po

po/vi.po

po/webbrowser-app.pot

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/Ubuntu/Components/Extras/Browser/history-model.cpp

src/Ubuntu/Components/Extras/Browser/history-model.h

src/Ubuntu/Components/Extras/Browser/ua-overrides.js

src/app/Browser.qml

src/app/commandline-parser.cpp

src/app/commandline-parser.h

src/app/webbrowser-app.cpp

tests/autopilot/webbrowser_app/tests/test_addressbar_selection.py

tests/autopilot/webbrowser_app/tests/test_progressbar.py

tests/unittests/commandline-parser/tst_CommandLineParserTests.cpp

tests/unittests/history-model/tst_HistoryModelTests.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

po/webbrowser-app.pot

src/Ubuntu/Components/Extras/Browser/history-model.cpp

src/Ubuntu/Components/Extras/Browser/history-model.h

src/Ubuntu/Components/Extras/Browser/ua-overrides.js

src/app/Browser.qml

src/app/commandline-parser.cpp

src/app/commandline-parser.h

src/app/webbrowser-app.cpp

tests/autopilot/webbrowser_app/tests/test_addressbar_selection.py

tests/autopilot/webbrowser_app/tests/test_progressbar.py

tests/unittests/commandline-parser/tst_CommandLineParserTests.cpp

tests/unittests/history-model/tst_HistoryModelTests.cpp

Older »