Steve Harris 26bf27c70d Issue #1871 - Merge branch 'vlab' into development ... Conflicts: edexOsgi/com.raytheon.uf.common.base.feature/feature.xml Former-commit-id: 836c0d6a7873dd77dd58226fe389736652fb51a9		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