diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-29 17:15:35 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-29 17:15:35 (GMT) |
| commit | 1b42be673b2cd237ce873df9f4b0b339aab9518a (patch) | |
| tree | d4d7293ef51bfdbf1181a8772fa9e856207a8771 /Makefile.config | |
| parent | 2ec41693aeefe3c9ce78ff3654a11ff6bd2b7123 (diff) | |
Merge system-3.4 and 3.6
Diffstat (limited to 'Makefile.config')
| -rw-r--r-- | Makefile.config | 3 |
1 files changed, 1 insertions, 2 deletions
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 |