Todd Gamblin 88b73bacdb Merge branch 'features/newarch' into develop ... Conflicts: lib/spack/spack/config.py var/spack/repos/builtin/packages/lua/package.py		2016-06-16 03:03:26 -07:00
..
mock_configs/site_spackconfig	Merged newarch into merge	2016-03-22 15:22:51 -07:00
packages	moving go packages to the new path	2016-05-14 18:06:42 -07:00
repos	Merge branch 'features/newarch' into develop	2016-06-16 03:03:26 -07:00