Steve Harris
|
0f53c46d7a
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: ed8c0487fe
|
2013-04-04 11:58:50 -05:00 |
|
Steve Harris
|
0edd049e3b
|
13.3.1-18 baseline
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
|
2013-04-03 14:58:29 -05:00 |
|
Bryan Kowal
|
63f7abc798
|
Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: 820518ffb9 [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]
Former-commit-id: 3baebb684b
Former-commit-id: 374bd51fb0
|
2013-03-20 16:53:18 -05:00 |
|
Steve Harris
|
8db98c2d71
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: 0379be06d2
Former-commit-id: 4fc2bb7bba
|
2013-03-20 16:09:26 -05:00 |
|
Steve Harris
|
e9f0328808
|
13.3.1-10 baseline
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
|
2013-03-20 15:53:01 -05:00 |
|
Max Schenkelberg
|
ec27a16858
|
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 2e10fd83f6
|
2013-03-20 14:10:52 -05:00 |
|
Steve Harris
|
2a26783ba7
|
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: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
|
2013-03-18 16:52:00 -05:00 |
|
Steve Harris
|
81a3f29afc
|
13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
|
2013-03-18 15:43:32 -05:00 |
|
Dustin Johnson
|
7adf94e9f6
|
Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: 43a9f608ef
Former-commit-id: 1b82ad0dc4
|
2013-03-15 11:51:58 -05:00 |
|
Steve Harris
|
6fe4b16924
|
13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
8ed6a53113
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
7fb0b17bd5
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
a2a6a18fae
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|