From e7a33e537d1ea5432cdc17aadfb07f33efd7037f Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 01 Aug 2012 19:23:51 +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 399d6fb..946f362 100644
--- a/Makefile
+++ b/Makefile
@@ -76,5 +76,9 @@ clean:
 	rm -rf source/sugar-fructose
 	rm -rf source/at-spi2-core
 	rm -rf source/at-spi2-atk
+	rm -rf source/gstreamer
+	rm -rf source/gst-plugins-base
+	rm -rf source/gst-plugins-good
 	rm -f logs/*.log logs/all-logs.tar.bz2
 	rm -f scripts/list-outputs
+	rm -f scripts/find-free-display
--
cgit v0.9.1