Mirror of Unidata's AWIPS2.
Find a file
Richard Peter ad2791c20b Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

Former-commit-id: a6aa1c74fc [formerly 1eb943d331] [formerly 984785ce5e] [formerly 984785ce5e [formerly e45689dbc7]] [formerly a6aa1c74fc [formerly 1eb943d331] [formerly 984785ce5e] [formerly 984785ce5e [formerly e45689dbc7]] [formerly add32a774f [formerly 984785ce5e [formerly e45689dbc7] [formerly add32a774f [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]]]
Former-commit-id: add32a774f
Former-commit-id: 3d6bb79116 [formerly 64d062aa4b] [formerly aa2eda2c38] [formerly 5b2391efb6065a4f8e2ba097b47eaafcabff84e0 [formerly 346bf1cefacad9a336319ff9af04ac8832f33e41] [formerly aa2eda2c38 [formerly c178e4543a]]]
Former-commit-id: 373a59890a80fb80b35fc1f0dbf94ebb9e39d99e [formerly e210fa8935d6faf05e7b000811df47d3a19ffb19] [formerly 32dd0fedc1 [formerly 06737e3fa2]]
Former-commit-id: 32dd0fedc1
Former-commit-id: ec9e48704b
2013-10-01 14:22:33 -05:00
cave Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3 2013-10-01 14:22:33 -05:00
cots Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs 2013-09-12 13:47:43 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts 13.5.2-4 baseline 2013-09-12 11:13:59 -04:00
edexOsgi Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3 2013-10-01 14:22:33 -05:00
javaUtilities 13.5.1.1-3 baseline 2013-09-23 10:16:44 -04: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 #2176 Increased line width of emergency polygon and changed font for regular warning products. 2013-09-05 11:24:16 -05:00
MHSEmulator Issue #2009: Fix NullPointerException in SocketServer start up. 2013-08-14 17:13:58 -05:00
msi 13.5.2-4 baseline 2013-09-12 11:13:59 -04:00
nativeLib Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2 2013-09-24 12:29:16 -05:00
ncep Issue #2362: Fix gpd-ingest to not register with distributionSrv 2013-09-26 14:32:17 -05:00
ost Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3 2013-09-24 12:57:48 -05:00
pythonPackages Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3 2013-10-01 14:22:33 -05:00
RadarServer 13.5.1-8 baseline 2013-07-26 09:02:34 -04:00
rpms Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2 2013-09-24 12:29:16 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2224 Unit test now handles different time types and configuation changes. 2013-09-12 11:50:23 -05: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