Merge lp://staging/~darkxst/gnome-shell/lp1128804 into lp://staging/ubuntu/raring/gnome-shell

Proposed by Tim Lunn
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp://staging/~darkxst/gnome-shell/lp1128804
Merge into: lp://staging/ubuntu/raring/gnome-shell
Diff against target: 29889 lines (+7272/-12973)
65 files modified
.pc/11-no-gettext.patch/configure.ac (+1/-1)
.pc/14_make-GLX-optional.patch/configure.ac (+1/-1)
.pc/applied-patches (+1/-3)
.pc/git_messagetray_fix_expansion.patch/js/ui/messageTray.js (+22/-7)
.pc/git_messagetray_hideNotification.patch/js/ui/messageTray.js (+0/-2545)
.pc/git_messagetray_opacity_fix.patch/js/ui/messageTray.js (+0/-2550)
.pc/git_messagetray_remove_tweens.patch/js/ui/messageTray.js (+0/-2555)
NEWS (+18/-0)
configure (+16/-32)
configure.ac (+1/-1)
debian/changelog (+17/-0)
debian/control (+1/-1)
debian/control.in (+1/-1)
debian/patches/calendar-remove-strict-check.patch (+19/-0)
debian/patches/series (+1/-3)
docs/reference/shell/Makefile.in (+45/-32)
docs/reference/shell/html/ShellNetworkAgent.html (+20/-0)
docs/reference/shell/html/annotation-glossary.html (+3/-0)
docs/reference/shell/html/api-index-full.html (+4/-0)
docs/reference/shell/html/ch01.html (+1/-1)
docs/reference/shell/html/ch02.html (+1/-1)
docs/reference/shell/html/ch03.html (+1/-1)
docs/reference/shell/html/ch04.html (+1/-1)
docs/reference/shell/html/ch05.html (+1/-1)
docs/reference/shell/html/ch06.html (+1/-1)
docs/reference/shell/html/index.html (+1/-1)
docs/reference/shell/html/index.sgml (+20/-0)
docs/reference/shell/html/shell-ShellApp.html (+20/-0)
docs/reference/shell/html/shell-ShellGlobal.html (+93/-8)
docs/reference/shell/html/shell-shell-mobile-providers.html (+20/-0)
docs/reference/shell/html/shell.devhelp2 (+19/-0)
docs/reference/shell/shell-docs.sgml (+1/-1)
docs/reference/shell/shell-sections.txt (+1/-8)
docs/reference/st/Makefile.in (+45/-32)
docs/reference/st/html/StTextureCache.html (+16/-0)
docs/reference/st/html/index.html (+1/-1)
docs/reference/st/html/index.sgml (+22/-0)
docs/reference/st/html/pt01.html (+1/-1)
docs/reference/st/html/st-st-theme-node.html (+121/-1)
docs/reference/st/html/st.devhelp2 (+22/-0)
docs/reference/st/st-docs.sgml (+1/-1)
gtk-doc.make (+42/-22)
js/misc/config.js (+1/-1)
js/ui/messageTray.js (+12/-0)
js/ui/screenShield.js (+48/-15)
js/ui/unlockDialog.js (+5/-2)
m4/gtk-doc.m4 (+5/-1)
po/as.po (+179/-148)
po/bn_IN.po (+1382/-570)
po/et.po (+25/-15)
po/fr.po (+135/-122)
po/hi.po (+179/-199)
po/hu.po (+145/-127)
po/id.po (+145/-139)
po/ja.po (+5/-486)
po/kn.po (+220/-186)
po/ml.po (+219/-179)
po/mr.po (+134/-124)
po/nl.po (+1030/-867)
po/pt_BR.po (+148/-147)
po/ta.po (+304/-252)
po/te.po (+225/-178)
po/ug.po (+2087/-1400)
src/Makefile-calendar-server.am (+0/-1)
src/shell-recorder-src.c (+16/-0)
To merge this branch: bzr merge lp://staging/~darkxst/gnome-shell/lp1128804
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+149189@code.staging.launchpad.net

Description of the change

update to new upstream release

To post a comment you must log in.
70. By Tim Lunn

add missing patch

71. By Tim Lunn

remove dep3 comment from patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: