Merge branch 'master' of http://git.drumgizmo.org/drumgizmo

3 files changed, 18 insertions, 9 deletions

diff --git a/lv2/drumgizmo.ttl b/lv2/drumgizmo.ttl
index 9e32e73..c72b34a 100644
--- a/lv2/drumgizmo.ttl
+++ b/lv2/drumgizmo.ttl
@@ -28,7 +28,7 @@
 	a lv2:InstrumentPlugin ;
 	doap:name "DrumGizmo" ;
 	doap:maintainer [
-		foaf:name "Bent Bisballe Nyeng / Lars Bisballe Jensen / Jonas Suhr Christensen";
+		foaf:name "DrumGizmo.org";
 		foaf:homepage <http://www.drumgizmo.org> ;
 	] ;
 	doap:license <http://usefulinc.com/doap/licenses/gpl> ;
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
index be0ecb6..e705b3b 100644
--- a/plugingui/Makefile.am
+++ b/plugingui/Makefile.am
@@ -23,27 +23,34 @@ EXTRA_DIST = \
 	button.h \
 	checkbox.h \
 	colour.h \
+	combobox.h \
 	directory.h \
-  eventhandler.h \
+	eventhandler.h \
+	filebrowser.h \
 	font.h \
 	guievent.h \
 	image.h \
+	knob.h \
 	label.h \
 	led.h \
 	lineedit.h \
+	listbox.h \
+	listboxbasic.h \
+	listboxthin.h \
 	nativewindow.h \
 	nativewindow_win32.h \
 	nativewindow_x11.h \
 	painter.h \
 	pixelbuffer.h \
 	plugingui.h \
+	progressbar.h \
+	resource.h \
+	resource_data.h \
+	scrollbar.h \
 	slider.h \
+	verticalline.h \
 	widget.h \
-	window.h \
-	listbox.h \
-	knob.h \
-	filebrowser.h \
-	combobox.h
+	window.h
 
 ################
 # Test Section #
diff --git a/src/Makefile.am b/src/Makefile.am
index 386d373..76288ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST = \
 	audio.h \
 	audiofile.h \
 	audioinputengine.h \
+	audioinputenginemidi.h \
 	audiooutputengine.h \
 	beatmapper.h \
 	channel.h \
@@ -14,6 +15,7 @@ EXTRA_DIST = \
 	events.h \
 	instrument.h \
 	instrumentparser.h \
+	message.h \
 	midimapparser.h \
 	midimapper.h \
 	mutex.h \
@@ -24,11 +26,11 @@ EXTRA_DIST = \
 	semaphore.h \
 	thread.h \
 	velocity.h \
-\
+ \
 	audiofile.cc \
 	audioinputengine.cc \
-	audiooutputengine.cc \
 	audioinputenginemidi.cc \
+	audiooutputengine.cc \
 	beatmapper.cc \
 	channel.cc \
 	channelmixer.cc \