Richard Peter 95eba8dcf6 Merge branch 'master_14.1.2' into master_14.2.1 ... Conflicts: cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java edexOsgi/build.edex/esb/conf/log4j.xml edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2		2014-04-09 16:00:54 -05:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
res/spring	Merged 1354 -5 and -6 into 1412 based on 1411-25	2014-04-04 12:57:32 -04:00
src/com/raytheon/edex/services	14.1.1-7 baseline	2013-11-06 14:16:14 -05:00
unit-test/com/raytheon/edex/services	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
utility/edex_static/base	Issue #2032 moving localization edex_static files to respective plugins, except colormaps	2013-07-18 17:20:27 -05:00
.classpath	Issue #1302 Address peer review comments for 5-Data_Delivery/development merge	2012-11-08 09:57:16 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
com.raytheon.edex.utilitysrv.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00