From 741a424166b1ef4d6046ea543205d3992c21579f Mon Sep 17 00:00:00 2001
From: Dan Winship <dwinship@redhat.com>
Date: Thu, 20 Sep 2007 16:21:31 +0000
Subject: Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar

---
diff --git a/NEWS b/NEWS
index 8e5c9e9..7bd313a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* #2211 New XRestop interface style in Developer Console (edsiper)
 * #3649 Human readable file names on USB. (marco)
 
 Snapshot b8ce5083b7
diff --git a/configure.ac b/configure.ac
index 102704e..5b4f366 100644
--- 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
diff --git a/services/console/interface/Makefile.am b/services/console/interface/Makefile.am
index ef0f3e4..bd63b56 100644
--- 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 =				\
diff --git a/services/console/lib/Makefile.am b/services/console/lib/Makefile.am
index 238c435..c48a0c1 100644
--- 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                     
 
--
cgit v0.9.1