awips2/cave/com.raytheon.viz.avnconfig
Richard Peter 5676090443 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: b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
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
localization/aviation Merge branch 'master_14.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
META-INF Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base 2013-08-09 14:24:49 -05:00
src/com/raytheon/viz Issue #2277 Remove more ScriptCreator references 2013-09-11 16:32:00 -05:00
.classpath Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Issue #2033 moved avnfps and text workstation files into respective plugins. 2013-08-15 12:21:43 -05:00
com.raytheon.viz.avnconfig.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
config.xml Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00