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: b8f0635ad67fcf9f1cb2
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: 1a999fee5ac18b96dc4c
2013-03-18 16:43:22 -05:00
Steve Harris
5f492500ea
13.3.1-8 baseline
...
Former-commit-id: f97d78994bc15b3ffe20
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: f46686a6e22ca86633d6
2013-02-28 17:00:56 -06:00
Steve Harris
f6670806bf
13.2.1-1 baseline
...
Former-commit-id: 9771dfae6bc63f9bcae0
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: ff72ce0b0cdb3e7bab99
2013-01-15 14:41:19 -06:00
Steve Harris
8713dfc5ca
13.2.1-1 baseline
...
Former-commit-id: e62172c8c781849e3cbb
2013-01-14 18:42:21 -05:00
Steve Harris
dbcae57f57
13.1.2-6 baseline
...
Former-commit-id: 8e5f9e0e6c59969775ad
2013-01-06 14:55:11 -06:00
Steve Harris
941337c553
13.1.2-2 baseline
...
Former-commit-id: c0c1d56f3a4ba416aeb3
2013-01-06 14:32:24 -06:00
Steve Harris
ee06a94735
12.12.1-8 baseline
...
Former-commit-id: 19962f41ba5093a7c442
2012-12-06 09:02:51 -06:00
Steve Harris
2797cbcdd0
12.12.1-3 baseline
...
Former-commit-id: c999505fbab3b5e6d28f
2012-11-13 17:27:04 -06:00
Steve Harris
7bd9c63dc7
12.10.1-1 baseline
...
Former-commit-id: 195158c004d708932029
2012-09-04 12:07:27 -05:00
Steve Harris
a14374fcd4
12.9.1-11 baseline
...
Former-commit-id: 6eb6b0909bfc405efab7
2012-08-30 14:36:12 -05:00
Steve Harris
9990bf909b
12.9.1-4 baseline
...
Former-commit-id: dcda3a229033b95fb96d
2012-08-15 15:19:10 -05:00
Steve Harris
edbbacfa8a
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f6084bbf2573e
2012-08-15 14:26:10 -05:00
Steve Harris
448ed038c2
12.9.1-2 baseline
...
Former-commit-id: d1d877d319a198b3a807
2012-08-15 14:12:24 -05:00
Steve Harris
e0c3722fd1
12.8.1-5 baseline
...
Former-commit-id: fd2abfb6f1cd49ef3eda
2012-08-01 10:45:37 -05:00
Steve Harris
9f97182964
12.7.1-8 baseline
...
Former-commit-id: 16bf591a33c42ae0fa39
2012-07-19 16:20:40 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Matt Nash
1faae42484
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f71206a8b51d6d
2012-01-06 08:55:05 -06:00
