Steve Harris 27bc369818 Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration ... Conflicts: cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java Former-commit-id: 8f71c807be1d604cea51ab522f04f8bbf8c11f83		2012-05-09 13:14:00 -05:00
..
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.uf.viz.feature.alertviz.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
feature.xml	Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.	2012-04-10 16:42:36 -05:00