-
Committer:
Jackson Doak
-
Date:
2013-12-19 00:26:38 UTC
-
mfrom:
(1.1.10 sid)
-
Revision ID:
noskcaj@ubuntu.com-20131219002638-5netn6v173kgkuod
* Merge from debian. Remaining changes:
* debian/patches/01_use-ubuntu-help.patch:
- restore gnome-utils patch to use the ubuntu help uri
* debian/patches/ubuntu_interactive_screenshots.patch:
- on Unity sessions display a confirmation dialog after taking
screenshots with the keybindings, the auto saving behaviour is
confusing our users
* debian/patches/ubuntu_unity_no_gnomeshell.patch:
- don't try to use the gnome-shell interface under Unity
* debian/patches/update_unity_list.patch:
- update to the current xdg format, tweak capitalization
- list action to take screenshot of an area,
thanks Christopher Kyle Horton
* debian/patches/uri.patch:
- fix display of accented characters correctly