Bryan Kowal
|
7d807fad71
|
Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 4acb1d8693 [formerly 403599d216e643dba2fcae0883f32987c7bade3f]
Former-commit-id: 5fe8bd69f8
|
2012-06-27 18:38:19 -05:00 |
|
Bryan Kowal
|
9a7d0492fe
|
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: a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: b87b66abc5
|
2012-06-27 17:21:48 -05:00 |
|
Brad Gonzales
|
a289b1f008
|
Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: c00fb6f089 [formerly 063414b3e997718b74d59cb0155dc081fe91504c]
Former-commit-id: c99fa8db33
|
2012-06-26 15:41:14 -05:00 |
|
Brad Gonzales
|
23ede5fa7b
|
Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 3799026523 [formerly 237309aab32cdb36703dbe62d2cfe102b3197863]
Former-commit-id: bef2bfa7cc
|
2012-06-22 15:08:40 -05:00 |
|
Steve Harris
|
8367fb50f5
|
Revert "12.6.1-10 baseline"
This reverts commit b33c5bdfcf [formerly a2c0893d1a] [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: 25198a5cd6
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
b33c5bdfcf
|
12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: a2c0893d1a
|
2012-06-21 08:38:48 -05:00 |
|
Steve Harris
|
a945ed8e6d
|
12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: 8947efbc7f
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
a4e519f3cd
|
12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
|
2012-04-18 15:18:16 -05:00 |
|
root
|
3360eb6c5f
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
|
2012-01-06 08:55:05 -06:00 |
|