Commit graph

9 commits

Author SHA1 Message Date
Richard Peter
cd51f3fa87 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]
Former-commit-id: 3575d6586f
2014-04-11 16:23:09 -05:00
David Friedman
24ebf8854c ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 969c50b80f [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]
Former-commit-id: 611503cd96
2014-02-03 19:03:50 +00:00
Max Schenkelberg
b3aed99142 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]
Former-commit-id: 16046a4dde
2014-01-06 17:03:45 -06:00
Steve Harris
91a5e4578e 13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]
Former-commit-id: 9022c500ce
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
0d9119a1c7 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]
Former-commit-id: 2b6aa86371
2013-03-20 13:05:54 -05:00
Steve Harris
e38e81ab8c 12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]
Former-commit-id: fd19ca5624
2012-09-13 12:08:11 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00