Steve Harris
aaac0b51e5
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
cb5ea76f98
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 45de49bd241f4bc53b266792c0ae6cb4658527a7
2013-03-20 13:45:11 -05:00
Mike Duff
058064ce0d
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 7fc127dfaacc36b4051fa5a46774c2823b1d42b2
2013-03-19 10:10:01 -05:00
Steve Harris
7fcf9f1cb2
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: 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40
2013-03-18 16:52:00 -05:00
Steve Harris
c18b96dc4c
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: 5927ff20543395733d9302eba2e6772315730a80
2013-03-18 16:43:22 -05:00
Steve Harris
c15b3ffe20
13.3.1-8 baseline
...
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
2013-03-18 15:43:32 -05:00
Ben Steffensmeier
2ca86633d6
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
2013-02-28 17:00:56 -06:00
Steve Harris
c63f9bcae0
13.2.1-1 baseline
...
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
2013-01-23 11:13:03 -05:00
Max Schenkelberg
db3e7bab99
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: ab74da7808aa343983f532ee076820c7e63fdded
2013-01-15 14:41:19 -06:00
Steve Harris
81849e3cbb
13.2.1-1 baseline
...
Former-commit-id: 30d12654dea302c2bb0546edcb3b7ddd04ddd046
2013-01-14 18:42:21 -05:00
Steve Harris
59969775ad
13.1.2-6 baseline
...
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
4ba416aeb3
13.1.2-2 baseline
...
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Steve Harris
5093a7c442
12.12.1-8 baseline
...
Former-commit-id: 657c868c5e52717a6de00dc61892115d91ada1c4
2012-12-06 09:02:51 -06:00
Steve Harris
b3b5e6d28f
12.12.1-3 baseline
...
Former-commit-id: 8481c91f9918a61631198331c324c4c5a76aac0f
2012-11-13 17:27:04 -06:00
Steve Harris
d708932029
12.10.1-1 baseline
...
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
fc405efab7
12.9.1-11 baseline
...
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
2012-08-30 14:36:12 -05:00
Steve Harris
33b95fb96d
12.9.1-4 baseline
...
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
84bbf2573e
12.9.1-3 baseline
...
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
2012-08-15 14:26:10 -05:00
Steve Harris
a198b3a807
12.9.1-2 baseline
...
Former-commit-id: 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2
2012-08-15 14:12:24 -05:00
Steve Harris
cd49ef3eda
12.8.1-5 baseline
...
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
c42ae0fa39
12.7.1-8 baseline
...
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
8485b90ff8
12.4.1-10 baseline
...
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Steve Harris
2a216f333c
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Steve Harris
22bd792cd9
12.3.1-10 baseline
...
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Matt Nash
c83e5ff474
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
06a8b51d6d
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
