Merge lp://qastaging/~timo-jyrinki/ubuntu-online-tour/chromeless-1204 into lp://qastaging/ubuntu-online-tour/12.04
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Merged at revision: | 28 |
| Proposed branch: | lp://qastaging/~timo-jyrinki/ubuntu-online-tour/chromeless-1204 |
| Merge into: | lp://qastaging/ubuntu-online-tour/12.04 |
| Diff against target: |
157 lines (+92/-1) 9 files modified
Makefile.am (+1/-0) chromeless/application.ini (+10/-0) chromeless/chrome.manifest (+1/-0) chromeless/chrome/content/app.xul (+10/-0) chromeless/defaults/preferences/prefs.js (+2/-0) data/ubuntu-online-tour.desktop.in (+1/-1) debian/changelog (+9/-0) po/fi.po (+29/-0) po/zh_CN.po (+29/-0) |
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/ubuntu-online-tour/chromeless-1204 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Anthony Dillon | Approve | ||
|
Review via email:
|
|||
Description of the change
This is the same as the other merge request, but rebased to 12.04 branch instead. Please merge both.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for that, I'll omit it from the upload to the website.