[gnome-shell/datetime: 31/31] Merge branch 'master' into datetime
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/datetime: 31/31] Merge branch 'master' into datetime
- Date: Mon, 24 Jan 2011 20:29:15 +0000 (UTC)
commit 50c5591ec22424d97eb5ab87b273a046a05a997d
Merge: bce2cf9 d107b84
Author: David Zeuthen <davidz redhat com>
Date: Mon Jan 24 15:27:13 2011 -0500
Merge branch 'master' into datetime
data/org.gnome.shell.gschema.xml.in | 6 +-
data/theme/gnome-shell.css | 12 +-
js/ui/altTab.js | 62 ++-
js/ui/appDisplay.js | 11 +-
js/ui/messageTray.js | 2 +-
js/ui/overview.js | 179 ++++++++-
js/ui/panel.js | 28 +-
js/ui/searchDisplay.js | 12 +-
js/ui/status/keyboard.js | 55 +++-
js/ui/workspace.js | 16 +-
js/ui/workspacesView.js | 183 +++------
po/ar.po | 59 ++--
po/es.po | 120 +++---
po/he.po | 65 ++--
po/it.po | 102 +++--
src/Makefile-st.am | 8 +-
src/Makefile.am | 2 +-
src/gdmuser/gdm-user-manager.c | 13 +-
src/gdmuser/gdm-user.c | 4 -
src/gvc/gvc-mixer-event-role.c | 6 -
src/gvc/gvc-mixer-sink-input.c | 9 -
src/gvc/gvc-mixer-sink.c | 7 -
src/gvc/gvc-mixer-source-output.c | 3 -
src/gvc/gvc-mixer-source.c | 7 -
src/shell-app-system.c | 2 -
src/shell-app-usage.c | 3 +-
src/shell-doc-system.c | 3 +-
src/shell-global.c | 3 +-
src/shell-recorder.c | 73 +++-
src/shell-window-tracker.c | 3 -
src/st/st-icon.c | 25 +-
src/st/st-overflow-box.c | 3 +-
src/st/st-private.c | 209 +++++++--
src/st/st-private.h | 4 +
src/st/st-scroll-bar.c | 2 -
src/st/st-scroll-view-fade.c | 348 +++++++++++++++
src/st/st-scroll-view-fade.h | 40 ++
src/st/st-scroll-view.c | 179 ++------
src/st/st-scroll-view.h | 4 +-
src/st/st-table.c | 9 +-
src/st/st-texture-cache.c | 98 ++++
src/st/st-texture-cache.h | 3 +
src/st/st-theme-node-drawing.c | 733 +++++++++++++++++++++++++------
src/st/st-theme-node-private.h | 14 +-
src/st/st-theme-node-transition.c | 28 +-
src/st/st-theme-node-transition.h | 4 +
src/st/st-theme-node.c | 328 +++++++++++----
src/st/st-theme-node.h | 10 +-
src/st/st-widget.c | 13 +-
tests/Makefile.am | 1 +
tests/interactive/borders.js | 59 +++
tests/interactive/scroll-view-sizing.js | 18 +-
tests/testcommon/face-plain.png | Bin 0 -> 4298 bytes
tests/testcommon/test.css | 17 +
54 files changed, 2364 insertions(+), 843 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]