Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar

2007-09-20 12:21:31 -04:00 · 2007-09-20 12:21:31 -04:00 · 741a424166
commit 741a424166
parent f377d6e519 5a595ea04e
4 changed files with 4 additions and 2 deletions
--- a/1
+++ b/1
@ -1,3 +1,4 @@
+* #2211 New XRestop interface style in Developer Console (edsiper)
 * #3649 Human readable file names on USB. (marco)

 Snapshot b8ce5083b7
--- a/configure.ac
+++ b/configure.ac
@ -82,6 +82,7 @@ services/console/interface/memphis/Makefile
 services/console/interface/network/Makefile
 services/console/interface/logviewer/Makefile
 services/console/interface/terminal/Makefile
+services/console/interface/xserver/Makefile
 sugar/Makefile
 sugar/activity/Makefile
 sugar/bundle/Makefile
--- a/services/console/interface/Makefile.am
+++ b/services/console/interface/Makefile.am
@ -1,4 +1,4 @@
-SUBDIRS = memphis network logviewer terminal xo
+SUBDIRS = memphis network logviewer terminal xo xserver

 sugardir = $(pkgdatadir)/services/console/interface
 sugar_PYTHON =				\
--- a/services/console/lib/Makefile.am
+++ b/services/console/lib/Makefile.am
@ -1,6 +1,6 @@
 SUBDIRS = procmem graphics net ui

-sugardir = $(pkgdatadir)/shell/console/lib
+sugardir = $(pkgdatadir)/services/console/lib
 sugar_PYTHON =                          \
        pyxres.py