Steve Harris
|
5c9a6b83cc
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: ef87d76141000e00dc04ab0cc4db4ad80006b636
|
2013-04-04 11:58:50 -05:00 |
|
Steve Harris
|
ce6a06a7e3
|
13.3.1-18 baseline
Former-commit-id: 245ab5d951a10e74aba53b036001316e1c7653fe
|
2013-04-03 14:58:29 -05:00 |
|
Bryan Kowal
|
3baebb684b
|
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: 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515
|
2013-03-20 16:53:18 -05:00 |
|
Steve Harris
|
0379be06d2
|
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: 67b25fa95817acafd25818c825656236597b6e09
|
2013-03-20 16:09:26 -05:00 |
|
Steve Harris
|
7078eec1b1
|
13.3.1-10 baseline
Former-commit-id: b48761e6f964bc7448439c1b69f85d75593ef90d
|
2013-03-20 15:53:01 -05:00 |
|
Max Schenkelberg
|
26cfcd2af5
|
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: d9cc808839d4a3210381329eec4f73e061be9968
|
2013-03-20 14:10:52 -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
|
c15b3ffe20
|
13.3.1-8 baseline
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
|
2013-03-18 15:43:32 -05:00 |
|
Dustin Johnson
|
43a9f608ef
|
Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 0e4c9f6ef22bf59f18ce3aab6539c52192539106
|
2013-03-15 11:51:58 -05:00 |
|
Steve Harris
|
566b677d09
|
13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
c63f9bcae0
|
13.2.1-1 baseline
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -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 |
|