xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
4449 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
Richard Peter e4f59ea119 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]
Former-commit-id: 1de516964b
2013-12-17 21:04:53 -06:00
cave Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 2013-12-17 21:04:53 -06:00
cots Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge 2013-11-19 10:08:45 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1 2013-12-11 16:19:02 -06:00
edexOsgi Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 2013-12-17 21:04:53 -06:00
javaUtilities Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 2013-12-16 16:39:10 -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 #2176 Increased line width of emergency polygon and changed font for regular warning products. 2013-09-05 11:24:16 -05:00
MHSEmulator 13.5.2-2 baseline 2013-08-29 15:01:29 -04:00
msi Merge branch 'omaha_14.1.1' (14.1.1-11) into development 2013-12-05 12:12:27 -06:00
nativeLib Merge branch 'omaha_14.1.1' (14.1.1-11) into development 2013-12-05 12:12:27 -06:00
ncep Issue #2551: Update NCEP objects to extend PersistablePluginDataObject. 2013-12-03 17:24:01 -06:00
ost Issue #2333 Removed more unused fields from satellite record 2013-10-11 16:17:52 -05:00
pythonPackages Merge branch 'omaha_14.1.1' (14.1.1-11) into development 2013-12-05 12:12:27 -06:00
RadarServer Merge branch 'development' into development_on_RHEL6 2013-11-12 11:11:36 -06:00
rpms Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 2013-12-17 21:04:53 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2619 Fix rare dateline bug. 2013-12-12 10:30:22 -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