Mirror of Unidata's AWIPS2.
Find a file
Richard Peter efd1003a50 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 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
2014-04-09 16:00:54 -05:00
cave Merge branch 'master_14.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
cots Issue #2581 fix local storm report delta script and unique constraint 2014-01-15 09:50:35 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN 2014-01-30 12:02:42 -06:00
edexOsgi Merge branch 'master_14.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
javaUtilities Issue #2788 Fix topo for large areas. 2014-02-13 10:10:34 -06:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2009: Fix NullPointerException in SocketServer start up. 2013-07-23 13:57:38 -05:00
msi Merge branch 'master_14.1.1' into master_14.2.1 2014-03-07 09:01:09 -05:00
nativeLib Fixed comment merge conflicts added .gitignore 2014-03-25 15:41:58 -04:00
ncep Issue #2919 fix windows error due to gempak library missing 2014-03-20 09:38:07 -05:00
ost Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 2014-03-06 08:39:43 -06:00
pythonPackages Merge branch 'master_14.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
RadarServer ASM #74 - Fix RadarServer configuration import utility JAR dependency 2014-03-06 17:07:23 +00:00
rpms Merge branch 'master_14.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2386 fixed spatial overlap rule application. 2014-02-25 09:22:08 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00