diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-29 16:50:31 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-29 16:59:24 (GMT) |
| commit | 2ec41693aeefe3c9ce78ff3654a11ff6bd2b7123 (patch) | |
| tree | 06aa399281a1c15ee23e709db3c65ae988d17e95 /Makefile.config | |
| parent | ce484748042ca4da34b4cf9ac640509e05517d81 (diff) | |
Merge 3.4 and 3.6 packages
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 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) |