[gnome-shell/overlay-design02: 7/7] Merge branch 'master' into my-overlay-design
- From: Marina Zhurakhinskaya <marinaz src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-shell/overlay-design02: 7/7] Merge branch 'master' into my-overlay-design
- Date: Mon, 8 Jun 2009 18:32:24 -0400 (EDT)
commit a9fedcce761b27347e6a3ea7fa61af60937c5930
Merge: dae1d94... 2c7d33b...
Author: Marina Zhurakhinskaya <marinaz redhat com>
Date: Mon Jun 8 18:02:31 2009 -0400
Merge branch 'master' into my-overlay-design
js/ui/chrome.js | 4 +
js/ui/dnd.js | 7 ++-
js/ui/genericDisplay.js | 3 +-
js/ui/tweener.js | 26 +++-----
src/big/box.c | 98 ++++++++++++++++------------
src/big/rectangle.c | 11 ++--
src/big/theme-image.c | 30 ++++-----
src/shell-app-monitor.c | 8 ++-
src/shell-global.c | 27 ++++-----
src/shell-gtk-embed.c | 20 +++---
src/shell-recorder.c | 6 +-
src/shell-status-menu.c | 6 +-
src/shell-texture-cache.c | 3 +-
src/tidy/tidy-grid.c | 154 ++++++++++++++++++++++-----------------------
src/tidy/tidy-grid.h | 8 +-
15 files changed, 210 insertions(+), 201 deletions(-)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]