Steve Harris 617bfcfc26 Issue #1871 - Merge branch 'vlab' into development ... Conflicts: edexOsgi/com.raytheon.uf.common.base.feature/feature.xml Former-commit-id: 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]] Former-commit-id: 26bf27c70d Former-commit-id: e83fa33a36 [formerly 629e76e0ff] [formerly 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]] Former-commit-id: 3f4447bcb9d22cc2cdec3a061500d9497c6a3d38 [formerly 9704fd6a82] Former-commit-id: 4d8d9354e7		2013-05-30 14:33:24 -05:00
..
.project	Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance	2013-02-27 16:19:58 -06:00
build.properties	Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance	2013-02-27 16:19:58 -06:00
feature.xml	Issue #1871 - Merge branch 'vlab' into development	2013-05-30 14:33:24 -05:00