From 1b42be673b2cd237ce873df9f4b0b339aab9518a Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 29 Nov 2012 17:15:35 +0000
Subject: Merge system-3.4 and 3.6

---
(limited to 'Makefile.config')

diff --git a/Makefile.config b/Makefile.config
index 467c1c1..95883c1 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -15,8 +15,7 @@ CONFIG_MODULES_DIR=config/modules
 CONFIG_MODULES= \
 	$(CONFIG_MODULES_DIR)/activities.json \
 	$(CONFIG_MODULES_DIR)/sugar.json \
-	$(CONFIG_MODULES_DIR)/system-3.4.json \
-	$(CONFIG_MODULES_DIR)/system-3.6.json
+	$(CONFIG_MODULES_DIR)/system.json
 
 CONFIG_PACKAGES_DIR=config/packages
 
--
cgit v0.9.1