xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
4822 commits 31 branches 40 tags 3.8 GiB
Java 75.8%
Python 18%
HTML 4.5%
Shell 1.3%
PLpgSQL 0.1%
Find a file
David Friedman f146c7bcd0 Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
2014-03-27 19:17:03 +00:00
cave Merge branch 'master_14.2.2' into asm_14.2.2 2014-03-27 19:17:03 +00: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.2.2' into asm_14.2.2 2014-03-27 19:17:03 +00: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 14.1.1-4 baseline 2013-10-28 10:55:16 -04: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 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 2014-03-10 15:14:59 -04:00
ost Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 2014-03-06 08:39:43 -06:00
pythonPackages ASM #349 - Workaround for QPID-5569 2014-03-07 14:58:09 +00:00
RadarServer ASM #74 - Fix RadarServer configuration import utility JAR dependency 2014-03-06 17:07:23 +00:00
rpms Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 2014-03-14 11:13:30 -04: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