Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--shell/Makefile.am3
-rw-r--r--shell/data/kbdconfig1
-rw-r--r--shell/view/Makefile.am1
4 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 77e70ca..6c904de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.49],[],[sugar])
+AC_INIT([Sugar],[0.51],[],[sugar])
AC_PREREQ([2.59])
diff --git a/shell/Makefile.am b/shell/Makefile.am
index a5c8533..885ca5e 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -4,7 +4,8 @@ bin_SCRIPTS = \
sugar-activity \
sugar-activity-factory \
sugar-log-viewer \
- sugar-shell
+ sugar-shell \
+ sugar-shutdown
sugardir = $(pkgdatadir)/shell
sugar_PYTHON = \
diff --git a/shell/data/kbdconfig b/shell/data/kbdconfig
index 967361a..30e4953 100644
--- a/shell/data/kbdconfig
+++ b/shell/data/kbdconfig
@@ -8,3 +8,4 @@
F12=!sugar-log-viewer
<Alt>q=!sugar-emulator-shutdown
+<Alt><Shift>Escape=!sugar-shutdown
diff --git a/shell/view/Makefile.am b/shell/view/Makefile.am
index 0e3951a..bf77593 100644
--- a/shell/view/Makefile.am
+++ b/shell/view/Makefile.am
@@ -9,4 +9,5 @@ sugar_PYTHON = \
BuddyMenu.py \
OverlayWindow.py \
Shell.py \
+ dconmanager.py \
stylesheet.py