From 2ec41693aeefe3c9ce78ff3654a11ff6bd2b7123 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 29 Nov 2012 16:50:31 +0000
Subject: Merge 3.4 and 3.6 packages

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

diff --git a/Makefile.config b/Makefile.config
index 913c8f8..467c1c1 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -23,8 +23,7 @@ CONFIG_PACKAGES_DIR=config/packages
 OONFIG_PACKAGES= \
 	$(CONFIG_PACKAGES_DIR)/basesystem.json \
 	$(CONFIG_PACKAGES_DIR)/buildslave.json \
-	$(CONFIG_PACKAGES_DIR)/deps-3.4.json \
-	$(CONFIG_PACKAGES_DIR)/deps-3.6.json
+	$(CONFIG_PACKAGES_DIR)/deps.json
 
 config-normalize:
 	@$(JSON_NORMALIZE) $(CONFIG_MODULES) $(OONFIG_PACKAGES)
--
cgit v0.9.1