Steve Harris
2e4db7ecaf
Merge branch 'master' (OB12.7.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.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/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
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.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 7efcfa7d8d
[formerly 07c40a9c0c
] [formerly 56249c2611
] [formerly 7efcfa7d8d
[formerly 07c40a9c0c
] [formerly 56249c2611
] [formerly 587bb6a274
[formerly 56249c2611
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]]
Former-commit-id: 587bb6a274
Former-commit-id: c18e221e26
[formerly 9e4df42326
] [formerly a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d
]]
Former-commit-id: b31a14d116ecfb9ad88c58315c24f622ad7bf245 [formerly d7540c958f
]
Former-commit-id: 84d0f1fbb6
2012-07-27 14:44:44 -05:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972
[formerly f2102bfb24
] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964
]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9
]
Former-commit-id: 36e2ad3023
2012-07-19 16:20:40 -05:00
Bryan Kowal
7fc3ac7397
Merge branch 'merge_development' into development
...
Former-commit-id: 291a674e41
[formerly 226818bda5
] [formerly 051a51b79c
] [formerly 291a674e41
[formerly 226818bda5
] [formerly 051a51b79c
] [formerly b27994c9b1
[formerly 051a51b79c
[formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]]]
Former-commit-id: b27994c9b1
Former-commit-id: c8dd1f50e9
[formerly 541b59d060
] [formerly c0a190ac0c964f309e33d6b6b28bdaa7c7fa56be [formerly fa5eb7a16a
]]
Former-commit-id: c21d3edb4bf2b603a9865dc0590527e7ebea54f7 [formerly a922be1a5d
]
Former-commit-id: e4a1ecfc18
2012-07-10 17:03:21 -05:00
Bryan Kowal
c152d7678f
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: 2acacb211a
[formerly c629f18f24
] [formerly 99d22f395a
] [formerly 2acacb211a
[formerly c629f18f24
] [formerly 99d22f395a
] [formerly f92eb59a73
[formerly 99d22f395a
[formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]]
Former-commit-id: f92eb59a73
Former-commit-id: 76ee9afb3f
[formerly 8d64fdba2c
] [formerly 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c
]]
Former-commit-id: 3ef9b4970b7c7eec89ff3c64f7174952b28b4ded [formerly 212afcceea
]
Former-commit-id: 5b4c392e7f
2012-07-10 16:57:16 -05:00
Steve Harris
461e720c3e
Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
...
These files have existing camel-cased equivalents and may not be needed.
Former-commit-id: a456af38fa
[formerly 8fff0d7e53
] [formerly 479ccdbed2
] [formerly a456af38fa
[formerly 8fff0d7e53
] [formerly 479ccdbed2
] [formerly 9454393d13
[formerly 479ccdbed2
[formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]]
Former-commit-id: 9454393d13
Former-commit-id: 1e747f0a42
[formerly 45ac1d4d51
] [formerly 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174
]]
Former-commit-id: fd07c26e5ac59302fff491238a67bd3c1240158d [formerly 19475ea67b
]
Former-commit-id: 1d367f861a
2012-07-10 09:29:33 -05:00
Steve Harris
c74431ba29
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2
[formerly dc50bc8443
] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0
]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b
]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Ron Anderson
8543c15f3c
Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
...
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97
Former-commit-id: 9667367c3c
[formerly d68ece4d55
] [formerly d3e0cd5af8
] [formerly 9667367c3c
[formerly d68ece4d55
] [formerly d3e0cd5af8
] [formerly e71059c2b9
[formerly d3e0cd5af8
[formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]]]]
Former-commit-id: e71059c2b9
Former-commit-id: ad85b5174a
[formerly 60de5ca0f4
] [formerly f3270e713227b4f39b8b265a24ecc31d0f507adf [formerly 473e6e9eb2
]]
Former-commit-id: 3b107b110beda40f6226304304293ca0b5c1a353 [formerly 34452f236e
]
Former-commit-id: 971c1d8731
2012-07-05 16:32:44 -05:00
Bryan Kowal
e05b247e3b
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: 455d7b90a9
[formerly b1b294c401
] [formerly a33740e915
] [formerly 455d7b90a9
[formerly b1b294c401
] [formerly a33740e915
] [formerly b87b66abc5
[formerly a33740e915
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72
[formerly b4917e6708
] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe
]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d
]
Former-commit-id: 2e5a850d28
2012-06-27 17:21:48 -05:00
Bryan Kowal
0a831eac6c
Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
...
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55
Former-commit-id: 466046f605
[formerly 1e06e23eca
] [formerly f7d19019a9
] [formerly 466046f605
[formerly 1e06e23eca
] [formerly f7d19019a9
] [formerly 98fdfa6f37
[formerly f7d19019a9
[formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]]]]
Former-commit-id: 98fdfa6f37
Former-commit-id: 6d52b70048
[formerly fca7bf5b45
] [formerly 14cc9da242f45d7762d577e57cd1819ba0d08184 [formerly 5874255a05
]]
Former-commit-id: 650eaadb877692d07a1f2570ef156c89bb187e9d [formerly 2ea8bed91e
]
Former-commit-id: 4fb7e68f4b
2012-06-27 16:22:53 -05:00
Steve Harris
8080ea523b
12.6.1-10 baseline
...
Former-commit-id: a9742f306e
[formerly edac4d827c
] [formerly 8dc4a774e2
] [formerly a9742f306e
[formerly edac4d827c
] [formerly 8dc4a774e2
] [formerly 3cd0902b49
[formerly 8dc4a774e2
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 7550311ef6
[formerly efe25edfad
] [formerly 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f
]]
Former-commit-id: 032c121c88e37cbeafabb63e30162517b2659626 [formerly df59dc7c44
]
Former-commit-id: 56f8cf00a8
2012-06-21 08:58:00 -05:00
Steve Harris
c7356570ae
Revert "12.6.1-10 baseline"
...
This reverts commit 8d09188a88
[formerly 95e7f4fc0c
] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474
]] [formerly 530dfc0563
[formerly f8497470fc
] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]]] [formerly a2c0893d1a
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].
Former-commit-id: 584f7eddf8
[formerly 62cf6a9f92
] [formerly b4b1f6975f
] [formerly 584f7eddf8
[formerly 62cf6a9f92
] [formerly b4b1f6975f
] [formerly 25198a5cd6
[formerly b4b1f6975f
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4
[formerly 333fd9c64e
] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5
]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418
]
Former-commit-id: e77a15c047
2012-06-21 08:51:08 -05:00
Steve Harris
8d09188a88
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563
[formerly f8497470fc
] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474
]
Former-commit-id: 95e7f4fc0c
2012-06-21 08:38:48 -05:00
Bryan Kowal
6706056477
Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
...
Former-commit-id: a6814ec7fb
[formerly fa84e5df3e
] [formerly 207bbd3087
] [formerly a6814ec7fb
[formerly fa84e5df3e
] [formerly 207bbd3087
] [formerly 25addabe64
[formerly 207bbd3087
[formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]]
Former-commit-id: 25addabe64
Former-commit-id: f064abd37a
[formerly 21a02e1510
] [formerly 17ed68aef27593eee306fe2fb3bb631e5e2624fc [formerly 94e4af6d47
]]
Former-commit-id: 26b9b80270ee9967c245bdeb19a771d7cfaad8d6 [formerly 85507d67dd
]
Former-commit-id: b69b1e9509
2012-06-19 15:03:57 -05:00
Steve Harris
ec9204fa94
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3
[formerly af6c0529ad
] [formerly 2f20a86a30
] [formerly 03383359f3
[formerly af6c0529ad
] [formerly 2f20a86a30
] [formerly 48860df690
[formerly 2f20a86a30
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e
[formerly d7a4853091
] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd
]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f
]
Former-commit-id: 70a928d039
2012-06-12 14:37:12 -05:00
Steve Harris
883d66bc46
12.6.1-5 baseline
...
Former-commit-id: 1ad64ffa98
[formerly 09f73b0601
] [formerly c99afab05f
] [formerly 1ad64ffa98
[formerly 09f73b0601
] [formerly c99afab05f
] [formerly 8947efbc7f
[formerly c99afab05f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2
[formerly b69fa75919
] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d
]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad
]
Former-commit-id: 3b468d9f50
2012-06-11 16:23:47 -05:00
Steve Harris
581546a5eb
12.6.1-3 baseline
...
Former-commit-id: bc96eba820
[formerly 7c5306b795
] [formerly 42f3513175
] [formerly bc96eba820
[formerly 7c5306b795
] [formerly 42f3513175
] [formerly d57eb02b9e
[formerly 42f3513175
[formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04
[formerly 32c0464d79
] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237
]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3
]
Former-commit-id: 518fa79f7f
2012-06-11 16:23:47 -05:00
Steve Harris
61e2068af7
12.5.1-15 baseline
...
Former-commit-id: 244755b393
[formerly 0ca936807e
] [formerly d5c238de07
] [formerly 244755b393
[formerly 0ca936807e
] [formerly d5c238de07
] [formerly cee20d8656
[formerly d5c238de07
[formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]]
Former-commit-id: cee20d8656
Former-commit-id: cd017cbb21
[formerly 31d7649939
] [formerly 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a
]]
Former-commit-id: 6cb525b2e1f0b266e8a8aef21ae0d0c57440c151 [formerly ad91dc8a2e
]
Former-commit-id: ca0f3f5814
2012-06-11 16:02:30 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Max Schenkelberg
00ec4036a7
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
...
on undo/redo from keyboard
Former-commit-id: 603726498f
[formerly f0e2ef8c91
] [formerly b5da470e0a
] [formerly 603726498f
[formerly f0e2ef8c91
] [formerly b5da470e0a
] [formerly 8b87b6a0a1
[formerly b5da470e0a
[formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]]]
Former-commit-id: 8b87b6a0a1
Former-commit-id: 4fe4709862
[formerly af72c6411a
] [formerly 1b3f753ea0cf2015ee33e8f1e26d5a3ddf66eec2 [formerly a6ca2ee4f6
]]
Former-commit-id: b94f4e93217e51045854356a11935c614f1c67fc [formerly 55949aef25
]
Former-commit-id: 4618dc9b94
2012-06-05 16:43:27 -05:00
Steve Harris
17403e71d1
12.5.1-9 baseline
...
Former-commit-id: 45773fbee0
[formerly b8de76b45e
] [formerly 8f3c9ebfb7
] [formerly 45773fbee0
[formerly b8de76b45e
] [formerly 8f3c9ebfb7
] [formerly 1f542697cb
[formerly 8f3c9ebfb7
[formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]]
Former-commit-id: 1f542697cb
Former-commit-id: dbedcc229c
[formerly d23b0e4d60
] [formerly 7f45c65c47eed82c8ae433d59f2e859d5e1df5a0 [formerly ce0422a34a
]]
Former-commit-id: 6decc15480698e9232071e71afd1e40f6e166fd7 [formerly 399c00d295
]
Former-commit-id: ee7b53c7c4
2012-05-21 17:48:55 -05:00
Steve Harris
e460104ec9
12.5.1-6 baseline
...
Former-commit-id: ba6d779949
[formerly df80148db6
] [formerly 24474489f9
] [formerly ba6d779949
[formerly df80148db6
] [formerly 24474489f9
] [formerly fa87dc6cf1
[formerly 24474489f9
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025
[formerly 4792884ab2
] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633
]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019
]
Former-commit-id: 26ed02c3dc
2012-05-16 16:41:22 -05:00
Max Schenkelberg
2f174128da
Issue #588 Fix VizPainter.py bug from previous commit
...
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7
Former-commit-id: 8f74ccc2b8
[formerly c3ec79ef6c
] [formerly c2e1e83033
] [formerly 8f74ccc2b8
[formerly c3ec79ef6c
] [formerly c2e1e83033
] [formerly ea2151970a
[formerly c2e1e83033
[formerly 0e70b319d47cd198b71426789671efeaa4ddb9f7]]]]
Former-commit-id: ea2151970a
Former-commit-id: 29c1030f74
[formerly 0f3aae5fd7
] [formerly d49721bccbaf90673aa998f0da0bdca12a7f79d9 [formerly aa5f1d12db
]]
Former-commit-id: 16eae6ac05b012b2723b3edef8c2d2fa8c12f99e [formerly baff521c40
]
Former-commit-id: 6a11940974
2012-05-09 15:38:03 -05:00
Max Schenkelberg
2d167af343
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b
[formerly 06ee0bbf6f
] [formerly 78e1bd2c62
] [formerly 82298cb03b
[formerly 06ee0bbf6f
] [formerly 78e1bd2c62
] [formerly 1f5abc6e20
[formerly 78e1bd2c62
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 985ee5a034
[formerly 2db836b296
] [formerly 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01
]]
Former-commit-id: ae5df9ba1774095dd47fab5b8b61888b552632fc [formerly 6cd18a09dc
]
Former-commit-id: 5729c0acc5
2012-05-09 15:02:30 -05:00
Steve Harris
c76fddc7e4
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed
[formerly 572e1bb476
] [formerly 27bc369818
] [formerly bcc12e03ed
[formerly 572e1bb476
] [formerly 27bc369818
] [formerly 58037cb5d1
[formerly 27bc369818
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c
[formerly 9c9e01dbda
] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7
]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640
]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
6715112613
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84
[formerly ac708c050d
] [formerly 84d191e7b6
] [formerly c1bc408f84
[formerly ac708c050d
] [formerly 84d191e7b6
] [formerly b36c69cc67
[formerly 84d191e7b6
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e
[formerly f6300cd995
] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf
]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413
]
Former-commit-id: ef49f63d8d
2012-05-03 19:17:13 -05:00
Steve Harris
7f90924706
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d
[formerly 33a67cdd82
] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5
]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86
]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
ad3bb08978
12.4.1-10 baseline
...
Former-commit-id: 931087306f
[formerly 418489e726
] [formerly 704b75e1a1
] [formerly 931087306f
[formerly 418489e726
] [formerly 704b75e1a1
] [formerly 01457fbbde
[formerly 704b75e1a1
[formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]]
Former-commit-id: 01457fbbde
Former-commit-id: caab7c1fbb
[formerly 97caaa0327
] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac
]]
Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb
]
Former-commit-id: f1eb6efb23
2012-04-24 15:38:29 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Bryan Kowal
22218f31bd
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
...
Former-commit-id: db3f60b23a
[formerly b1a5abc6b3
] [formerly 6ddeef48fa
] [formerly db3f60b23a
[formerly b1a5abc6b3
] [formerly 6ddeef48fa
] [formerly ce99417a2a
[formerly 6ddeef48fa
[formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]]
Former-commit-id: ce99417a2a
Former-commit-id: 8b08c8308e
[formerly 541fe8fbbb
] [formerly 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1
]]
Former-commit-id: ffb83e28c6229d71093fafcfa99acc4e62dc25af [formerly 47c7cba3f5
]
Former-commit-id: 07e4ddc1b9
2012-04-10 16:42:36 -05:00
Steve Harris
9340618732
12.3.1-10 baseline
...
Former-commit-id: 760ead2047
[formerly 0e4128712b
] [formerly 4068f5295f
] [formerly 760ead2047
[formerly 0e4128712b
] [formerly 4068f5295f
] [formerly 22bd792cd9
[formerly 4068f5295f
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39
[formerly 8bc60b1e32
] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605
]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b
]
Former-commit-id: 293563cfe7
2012-03-30 08:38:33 -05:00
Steve Harris
43ff909553
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5a96582f16
[formerly 92084b3f20
] [formerly d0bbbfefcc
] [formerly 5a96582f16
[formerly 92084b3f20
] [formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be
[formerly 92b7072b82
] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719
]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012
]
Former-commit-id: 3aef320ffd
2012-02-23 10:06:18 -06:00
Steve Harris
3a4af24369
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 829d2791e9
[formerly 8da36046de
] [formerly c8aae98741
] [formerly 829d2791e9
[formerly 8da36046de
] [formerly c8aae98741
] [formerly 54be9660f1
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6
[formerly b55a488ed8
] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963
]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc
]
Former-commit-id: 978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a811ac888f
[formerly 85075e6107
] [formerly 94c2ea985b
] [formerly a811ac888f
[formerly 85075e6107
] [formerly 94c2ea985b
] [formerly 9995d22e25
[formerly 94c2ea985b
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]]
Former-commit-id: 9995d22e25
Former-commit-id: 139d42c594
[formerly 610fdf3f4e
] [formerly dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5
]]
Former-commit-id: e696cc8d41ac682e234429cfacbb076d01f9bf39 [formerly 156ad8471d
]
Former-commit-id: 01d72ca3c9
2012-02-22 10:12:49 -06:00
Steve Harris
33aafe9ce0
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: d129eab241
[formerly c268da57bc
] [formerly 4b76d22f77
] [formerly d129eab241
[formerly c268da57bc
] [formerly 4b76d22f77
] [formerly cc66c8be24
[formerly 4b76d22f77
[formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]
Former-commit-id: cc66c8be24
Former-commit-id: c9a7ff42f4
[formerly dd911bed4d
] [formerly 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef
]]
Former-commit-id: 589ae505ef0a6ce52a577fd189d1c8eec012a6bd [formerly 09b81c6e00
]
Former-commit-id: 60bf5aeced
2012-02-20 12:43:38 -06:00
Steve Harris
8c9e581f41
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 7b4b066a2b
[formerly c209d6de36
] [formerly 93f6535bd8
] [formerly 7b4b066a2b
[formerly c209d6de36
] [formerly 93f6535bd8
] [formerly b137302802
[formerly 93f6535bd8
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a
[formerly 1ac6b36d1f
] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24
]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb
]
Former-commit-id: 9a09879521
2012-02-17 10:55:02 -06:00
Bryan Kowal
37715191e2
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 2f80fdcd73
[formerly 8e552ca56f
] [formerly 34d9122f14
] [formerly 2f80fdcd73
[formerly 8e552ca56f
] [formerly 34d9122f14
] [formerly c77b9558e1
[formerly 34d9122f14
[formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]]]
Former-commit-id: c77b9558e1
Former-commit-id: 026a95809f
[formerly ef4218bdb0
] [formerly 37e04f0a16c9fe0335037849dade6792c4d8246c [formerly 2c3f67d470
]]
Former-commit-id: cb59d4810120e8be52acedb7b7a86e366a399899 [formerly e40f50ba36
]
Former-commit-id: d9096e1306
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
42ef274021
Issue #228 change plots, grid icons, and radar icons
...
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.
Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2
Former-commit-id: 0fe5fe9c99
[formerly 792dc75f4d
] [formerly d976603262
] [formerly 0fe5fe9c99
[formerly 792dc75f4d
] [formerly d976603262
] [formerly 13a99abe7b
[formerly d976603262
[formerly 0f56c76ab830ef088a9576301c795dca7c855033]]]]
Former-commit-id: 13a99abe7b
Former-commit-id: 7c0e0c0365
[formerly ec90cad810
] [formerly 74f934c8254e91895c63256920cd1aef0bf21fd8 [formerly 63ef103145
]]
Former-commit-id: efb9f151d1843415599b612d587198c7b55787fa [formerly 70e38a4506
]
Former-commit-id: f6b65b8467
2012-02-01 12:45:56 -06:00
Nate Jensen
1448537aa4
Issue #181 fix ncep
...
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: 6418e0edda
[formerly f3875948e8
] [formerly ca923b9475
] [formerly 6418e0edda
[formerly f3875948e8
] [formerly ca923b9475
] [formerly 15e0a5e68d
[formerly ca923b9475
[formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]]]
Former-commit-id: 15e0a5e68d
Former-commit-id: b0c285c305
[formerly 637a516ae5
] [formerly e0dbbff654bb803f9a78bd56c5fbd86943f2b93e [formerly 29be9b82bd
]]
Former-commit-id: 5b7227de3276d8f0c708380cff967fd25a1f20b6 [formerly 076ceafddf
]
Former-commit-id: 12e15993ea
2012-01-26 17:28:06 -06:00
Roger Ferrel
05e5d62fa4
Issue #181
...
new files not indexed
Former-commit-id: 5fe3d78cb2
[formerly 732004d9cd
] [formerly 472e788dba
] [formerly 5fe3d78cb2
[formerly 732004d9cd
] [formerly 472e788dba
] [formerly 69f8daedff
[formerly 472e788dba
[formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]]]
Former-commit-id: 69f8daedff
Former-commit-id: 84fc2cf17c
[formerly 2be2e8478f
] [formerly ef41863ce82e3fa3eeb978a1d320f1286ca06bae [formerly c6f2b90560
]]
Former-commit-id: 4dc33abac816137b201539d9f7ab70c8ba33cf7d [formerly df778176a5
]
Former-commit-id: 7f4f111729
2012-01-26 14:37:19 -06:00
Roger Ferrel
628a6e15d1
Issue #181
...
The January ncep_build/build.cave changes
Former-commit-id: 4444d34d91
[formerly c5f7cfb665
] [formerly f00f3dd332
] [formerly 4444d34d91
[formerly c5f7cfb665
] [formerly f00f3dd332
] [formerly 750b17a81c
[formerly f00f3dd332
[formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]]]]
Former-commit-id: 750b17a81c
Former-commit-id: f9f27d4a3f
[formerly 9ed05c45c0
] [formerly 02ee0c47b8425f7ab330d991f5e22a6b3fa5a4e0 [formerly cbd8827872
]]
Former-commit-id: b4b9d133c7583f8adc166c8a317d9c460fd1a1d8 [formerly e20f37b19b
]
Former-commit-id: b48a31df21
2012-01-26 11:25:39 -06:00
Bryan Kowal
7e2690ee90
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
...
Former-commit-id: f522b77248
[formerly be61ec82b0
] [formerly 48b420cbb2
] [formerly f522b77248
[formerly be61ec82b0
] [formerly 48b420cbb2
] [formerly ff44a81ceb
[formerly 48b420cbb2
[formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5368408482
[formerly bddafa475a
] [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98
]]
Former-commit-id: b43548f0f51b0647e84191cf2451632da3f62170 [formerly dd1c5cdee4
]
Former-commit-id: 28028b9ad3
2012-01-23 12:36:13 -06:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90
[formerly 82300ccdcf
] [formerly 21d2361f00
[formerly 1faae42484
]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf
[formerly 8e80217e59
] [formerly 377dcd10b9
[formerly 3360eb6c5f
]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00