Ron Anderson
|
ba7a25a88f
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 9f121ec921a2f8635c48f005ddb71787ad6bf166
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
f2ad9da4eb
|
14.1.1-14 baseline
Former-commit-id: 46bdb43889bdc681fec2aba45004a1583caaa6ae
|
2014-01-06 14:02:30 -05:00 |
|
Ben Steffensmeier
|
5b6e32f47e
|
Issue #2491 fix d2d xy bundles.
Former-commit-id: 4f41b90c20e25689a24d73bdd92e24952516199a
|
2013-10-25 14:46:43 -05:00 |
|
Matt Nash
|
06e04a419d
|
Issue #2251 move style rules and preferences to common
Change-Id: I50bd92d1ed4e08d7d6204b7fa1cca0e8f1645030
Former-commit-id: 982f297ab19ebcb5e49f662c30b44992e63569cb
|
2013-09-10 09:28:11 -05:00 |
|
Steve Harris
|
31ae7ea218
|
12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
b13cbb7e00
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
67a5a68300
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
66be3bec40
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9f19e3f712
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|