Bryan Kowal
|
a33740e915
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: af5a90e383c1c115b363a33d9e72f957ada697a4
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
b4b1f6975f
|
Revert "12.6.1-10 baseline"
This reverts commit ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].
Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
ddde63eee0
|
12.6.1-10 baseline
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
|
2012-06-21 08:38:48 -05:00 |
|
Ben Steffensmeier
|
d187436589
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: faec1cb4e4e0ef6444da31971b937ad3ee79160a
|
2012-06-14 16:41:05 -05:00 |
|
Steve Harris
|
c99afab05f
|
12.6.1-5 baseline
Former-commit-id: 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
42f3513175
|
12.6.1-3 baseline
Former-commit-id: 2f4e12140a9b026770563eee58577b8aa2c041e1
|
2012-06-11 16:23:47 -05:00 |
|
Max Schenkelberg
|
80828b8441
|
Issue #239 Added drawing of lines so baslines would work
Change-Id: Id8ca06b2fc38ab0db5b167d33aeae5af974c30cc
Former-commit-id: 063e7ac34a6b5a6c43cf7927a1a2980f79efb24c
|
2012-05-18 12:34:00 -05:00 |
|
Max Schenkelberg
|
78e1bd2c62
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 6c456c0bad00aaa1fea67f90a4633b3e14a78495
|
2012-05-09 15:02:30 -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 |
|