[gnome-shell/datetime: 15/16] Merge branch 'master' into datetime
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/datetime: 15/16] Merge branch 'master' into datetime
- Date: Fri, 28 Jan 2011 17:06:06 +0000 (UTC)
commit 803e74101c6a7e9452c3c06e58786cc35b6b0a6e
Merge: 858e1b7 8a030e8
Author: David Zeuthen <davidz redhat com>
Date: Fri Jan 28 11:06:58 2011 -0500
Merge branch 'master' into datetime
configure.ac | 2 +-
data/Makefile.am | 1 -
data/gnome-shell.desktop.in.in | 2 +-
data/gs-applications.menu | 4 -
data/theme/dialog-error.svg | 222 ----------------------------------------
data/theme/gnome-shell.css | 13 +--
js/misc/util.js | 17 ++-
js/ui/runDialog.js | 13 ++-
js/ui/searchDisplay.js | 2 +
js/ui/statusIconDispatcher.js | 5 +-
js/ui/workspace.js | 4 +
js/ui/xdndHandler.js | 9 +-
po/et.po | 23 +++--
po/gl.po | 31 ++++---
po/nb.po | 165 ++++++++++++++++--------------
15 files changed, 161 insertions(+), 352 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]