xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro
History
Richard Peter 705339a320 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
2013-11-14 14:40:23 -06:00
..
actions Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg. 2013-07-16 10:28:32 -05:00
alertalarm 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
appsdefaults Issue #2361 remove ISerializableObject from redbook and hydro 2013-11-04 14:30:00 -06:00
bestestimateqpe 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
colorbar 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
colorscalemgr Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg. 2013-07-09 11:13:43 -05:00
contacts Issue #2088 Changes for non-blocking ContactsDlg. 2013-07-11 13:02:13 -05:00
cresthistory Issue #2088 Changes for non-blocking CrestHistoryDlg. 2013-07-15 07:56:14 -05:00
damdisplay Issue #2346 - fixed cursor memory leaks 2013-09-09 15:12:05 -05:00
datasources Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg. 2013-07-15 14:26:35 -05:00
datatrashcan 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
flashfloodguidance 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
gagedisplay Issue #1928 - Removed SWT browser to prevent errors. 2013-07-09 17:10:22 -05:00
headwatermodel Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
impactstatement Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg. 2013-07-15 14:26:35 -05:00
lowwaterstatement Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg. 2013-07-15 14:26:35 -05:00
perspective 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
pointdatacontrol 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
pointprecipitation 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
productviewer 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
questionabledata 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
ratingcurve Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg. 2013-07-16 10:28:32 -05:00
resource 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
riversummary 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
staffgage Issue #2349 - Fixed font memory leaks 2013-09-09 16:54:49 -05:00
stationlegend Issue #2324 - fixed image memory leaks 2013-09-04 18:09:53 -05:00
stationlist 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
stationprofile 14.1.1-8 baseline 2013-11-13 12:32:17 -05:00
stationreporting Issue #2349 - Fixed font memory leaks 2013-09-09 16:54:49 -05:00
textreport Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg. 2013-07-16 14:03:20 -05:00
timeseries Issue #2361 remove ISerializableObject from redbook and hydro 2013-11-04 14:30:00 -06:00
ui Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
util 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
Activator.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
CaveHydroSWTDialog.java 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
FontAction.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00