Commit graph

23 commits

Author SHA1 Message Date
Steve Harris
900b9aadde Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]
Former-commit-id: 7fcf9f1cb2
2013-03-18 16:52:00 -05:00
Steve Harris
245afb28c8 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]
Former-commit-id: c18b96dc4c
2013-03-18 16:43:22 -05:00
Steve Harris
5f492500ea 13.3.1-8 baseline
Former-commit-id: f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: c15b3ffe20
2013-03-18 15:43:32 -05:00
Ben Steffensmeier
5068b18c6a Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]
Former-commit-id: 2ca86633d6
2013-02-28 17:00:56 -06:00
Steve Harris
f6670806bf 13.2.1-1 baseline
Former-commit-id: 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: c63f9bcae0
2013-01-23 11:13:03 -05:00
Max Schenkelberg
c246f56568 Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]
Former-commit-id: db3e7bab99
2013-01-15 14:41:19 -06:00
Steve Harris
8713dfc5ca 13.2.1-1 baseline
Former-commit-id: e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]
Former-commit-id: 81849e3cbb
2013-01-14 18:42:21 -05:00
Steve Harris
dbcae57f57 13.1.2-6 baseline
Former-commit-id: 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 59969775ad
2013-01-06 14:55:11 -06:00
Steve Harris
941337c553 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: 4ba416aeb3
2013-01-06 14:32:24 -06:00
Steve Harris
ee06a94735 12.12.1-8 baseline
Former-commit-id: 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]
Former-commit-id: 5093a7c442
2012-12-06 09:02:51 -06:00
Steve Harris
2797cbcdd0 12.12.1-3 baseline
Former-commit-id: c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: b3b5e6d28f
2012-11-13 17:27:04 -06:00
Steve Harris
7bd9c63dc7 12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: d708932029
2012-09-04 12:07:27 -05:00
Steve Harris
a14374fcd4 12.9.1-11 baseline
Former-commit-id: 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]
Former-commit-id: fc405efab7
2012-08-30 14:36:12 -05:00
Steve Harris
9990bf909b 12.9.1-4 baseline
Former-commit-id: dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: 33b95fb96d
2012-08-15 15:19:10 -05:00
Steve Harris
edbbacfa8a 12.9.1-3 baseline
Former-commit-id: 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 84bbf2573e
2012-08-15 14:26:10 -05:00
Steve Harris
448ed038c2 12.9.1-2 baseline
Former-commit-id: d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: a198b3a807
2012-08-15 14:12:24 -05:00
Steve Harris
e0c3722fd1 12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: cd49ef3eda
2012-08-01 10:45:37 -05:00
Steve Harris
9f97182964 12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: c42ae0fa39
2012-07-19 16:20:40 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
ce3b74c605 12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
2012-03-30 08:38:33 -05:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00