merging builder branch into trunk

A    plugins/gtk+/glade-keysyms.c
M    plugins/gtk+/glade-gtk.c
M    plugins/gtk+/gtk+.xml.in
A    plugins/gtk+/glade-accels.c
M    plugins/gtk+/Makefile.am
A    plugins/gtk+/glade-accels.h
M    ChangeLog
M    gladeui/glade-editor.c
M    gladeui/glade-editor-property.c
M    gladeui/glade-editor-property.h
M    gladeui/glade-widget.c
M    gladeui/glade-widget.h
M    gladeui/glade-widget-adaptor.c
M    gladeui/glade-command.c
M    gladeui/glade-widget-adaptor.h
M    gladeui/glade-parser.c
M    gladeui/glade-xml-utils.c
M    gladeui/glade-base-editor.c
M    gladeui/glade-utils.c
D    gladeui/glade-parser.h
M    gladeui/glade-signal-editor.c
M    gladeui/glade-xml-utils.h
D    gladeui/glade-keysyms.c
M    gladeui/glade-property.c
M    gladeui/glade-property-class.c
M    gladeui/glade-property.h
M    gladeui/glade-builtins.c
M    gladeui/glade-property-class.h
M    gladeui/glade-builtins.h
M    gladeui/glade-project.c
M    gladeui/glade-signal.c
M    gladeui/Makefile.am
M    gladeui/glade-signal.h

svn path=/trunk/; revision=1764

1 files changed, 1 insertions, 4 deletions

diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 0367529d..efa884cb 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -51,10 +51,8 @@ libgladeui_1_la_SOURCES = \
 	glade-id-allocator.h \
 	glade-marshallers.c \
 	glade-accumulators.c \
-	glade-parser.c \
 	glade-builtins.c \
 	glade-app.c \
-	glade-keysyms.c \
 	glade-fixed.c \
 	glade-base-editor.c \
 	glade-palette-item.h \
@@ -110,11 +108,10 @@ libgladeuiinclude_HEADERS = \
 	glade-fixed.h \
 	glade-base-editor.h \
 	glade-xml-utils.h \
-	glade-parser.h \
 	glade-signal.h \
 	glade-cursor.h \
 	glade-widget-action.h
-	
+
 
 if PLATFORM_WIN32
 libgladeui_1_la_LDFLAGS += -no-undefined