From 3c1caa331330c81ee30e48df36e6d65803058b25 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Fri, 07 Sep 2012 11:36:33 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-build/sugar-build

Conflicts:
	Makefile
	scripts/system.modules
---
(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 737ce8c..475b90c 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,9 @@ clean:
 	rm -rf source/gst-plugins-espeak
 	rm -rf source/sugar
 	rm -rf source/sugar-toolkit-gtk3
+	rm -rf source/gst-plugins-bad
+	rm -rf source/gst-plugins-ugly
+	rm -rf source/gst-ffmpeg
 	rm -f logs/*.log logs/all-logs.tar.bz2
 	rm -f scripts/list-outputs
 	rm -f scripts/find-free-display
--
cgit v0.9.1