Steve Harris
07c40a9c0c
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: 587bb6a274
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 56249c2611
2012-07-27 14:44:44 -05:00
Steve Harris
11f96dbedd
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
2012-07-19 16:20:40 -05:00
Bryan Kowal
226818bda5
Merge branch 'merge_development' into development
...
Former-commit-id: b27994c9b1
[formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]
Former-commit-id: 051a51b79c
2012-07-10 17:03:21 -05:00
Bryan Kowal
c629f18f24
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
...
Former-commit-id: f92eb59a73
[formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: 99d22f395a
2012-07-10 16:57:16 -05:00
Steve Harris
8fff0d7e53
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: 9454393d13
[formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]
Former-commit-id: 479ccdbed2
2012-07-10 09:29:33 -05:00
Steve Harris
7c064b6868
12.6.1-9 baseline
...
Former-commit-id: 27afa60345
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Ron Anderson
d68ece4d55
Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
...
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97
Former-commit-id: e71059c2b9
[formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]
Former-commit-id: d3e0cd5af8
2012-07-05 16:32:44 -05:00
Bryan Kowal
b1b294c401
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: b87b66abc5
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: a33740e915
2012-06-27 17:21:48 -05:00
Bryan Kowal
1e06e23eca
Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
...
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55
Former-commit-id: 98fdfa6f37
[formerly b6990b5dc58e07fe7d5c85f8fa322723391193a4]
Former-commit-id: f7d19019a9
2012-06-27 16:22:53 -05:00
Steve Harris
edac4d827c
12.6.1-10 baseline
...
Former-commit-id: 3cd0902b49
[formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]
Former-commit-id: 8dc4a774e2
2012-06-21 08:58:00 -05:00
Steve Harris
62cf6a9f92
Revert "12.6.1-10 baseline"
...
This reverts commit 06f1c7b73c
[formerly ddde63eee0
] [formerly a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: 25198a5cd6
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: b4b1f6975f
2012-06-21 08:51:08 -05:00
Steve Harris
06f1c7b73c
12.6.1-10 baseline
...
Former-commit-id: a2c0893d1a
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: ddde63eee0
2012-06-21 08:38:48 -05:00
Bryan Kowal
fa84e5df3e
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: 25addabe64
[formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]
Former-commit-id: 207bbd3087
2012-06-19 15:03:57 -05:00
Steve Harris
af6c0529ad
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: 48860df690
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 2f20a86a30
2012-06-12 14:37:12 -05:00
Steve Harris
09f73b0601
12.6.1-5 baseline
...
Former-commit-id: 8947efbc7f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: c99afab05f
2012-06-11 16:23:47 -05:00
Steve Harris
7c5306b795
12.6.1-3 baseline
...
Former-commit-id: d57eb02b9e
[formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: 42f3513175
2012-06-11 16:23:47 -05:00
Steve Harris
0ca936807e
12.5.1-15 baseline
...
Former-commit-id: cee20d8656
[formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]
Former-commit-id: d5c238de07
2012-06-11 16:02:30 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Max Schenkelberg
f0e2ef8c91
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
...
on undo/redo from keyboard
Former-commit-id: 8b87b6a0a1
[formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]
Former-commit-id: b5da470e0a
2012-06-05 16:43:27 -05:00
Steve Harris
b8de76b45e
12.5.1-9 baseline
...
Former-commit-id: 1f542697cb
[formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]
Former-commit-id: 8f3c9ebfb7
2012-05-21 17:48:55 -05:00
Steve Harris
df80148db6
12.5.1-6 baseline
...
Former-commit-id: fa87dc6cf1
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: 24474489f9
2012-05-16 16:41:22 -05:00
Max Schenkelberg
c3ec79ef6c
Issue #588 Fix VizPainter.py bug from previous commit
...
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7
Former-commit-id: ea2151970a
[formerly 0e70b319d47cd198b71426789671efeaa4ddb9f7]
Former-commit-id: c2e1e83033
2012-05-09 15:38:03 -05:00
Max Schenkelberg
06ee0bbf6f
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 1f5abc6e20
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]
Former-commit-id: 78e1bd2c62
2012-05-09 15:02:30 -05:00
Steve Harris
572e1bb476
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: 58037cb5d1
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 27bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
ac708c050d
12.5.1-2 baseline
...
Former-commit-id: b36c69cc67
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]
Former-commit-id: 84d191e7b6
2012-05-03 19:17:13 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
418489e726
12.4.1-10 baseline
...
Former-commit-id: 01457fbbde
[formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]
Former-commit-id: 704b75e1a1
2012-04-24 15:38:29 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Bryan Kowal
b1a5abc6b3
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: ce99417a2a
[formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]
Former-commit-id: 6ddeef48fa
2012-04-10 16:42:36 -05:00
Steve Harris
0e4128712b
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd9
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
2012-03-30 08:38:33 -05:00
Steve Harris
92084b3f20
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: 7a10ca9766
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: d0bbbfefcc
2012-02-23 10:06:18 -06:00
Steve Harris
8da36046de
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 54be9660f1
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]
Former-commit-id: c8aae98741
2012-02-22 11:14:43 -06:00
Steve Harris
85075e6107
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 9995d22e25
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]
Former-commit-id: 94c2ea985b
2012-02-22 10:12:49 -06:00
Steve Harris
c268da57bc
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: cc66c8be24
[formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]
Former-commit-id: 4b76d22f77
2012-02-20 12:43:38 -06:00
Steve Harris
c209d6de36
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: b137302802
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]
Former-commit-id: 93f6535bd8
2012-02-17 10:55:02 -06:00
Bryan Kowal
8e552ca56f
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: c77b9558e1
[formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]
Former-commit-id: 34d9122f14
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
792dc75f4d
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: 13a99abe7b
[formerly 0f56c76ab830ef088a9576301c795dca7c855033]
Former-commit-id: d976603262
2012-02-01 12:45:56 -06:00
Nate Jensen
f3875948e8
Issue #181 fix ncep
...
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: 15e0a5e68d
[formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]
Former-commit-id: ca923b9475
2012-01-26 17:28:06 -06:00
Roger Ferrel
732004d9cd
Issue #181
...
new files not indexed
Former-commit-id: 69f8daedff
[formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]
Former-commit-id: 472e788dba
2012-01-26 14:37:19 -06:00
Roger Ferrel
c5f7cfb665
Issue #181
...
The January ncep_build/build.cave changes
Former-commit-id: 750b17a81c
[formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]
Former-commit-id: f00f3dd332
2012-01-26 11:25:39 -06:00
Bryan Kowal
be61ec82b0
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
...
Former-commit-id: ff44a81ceb
[formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]
Former-commit-id: 48b420cbb2
2012-01-23 12:36:13 -06:00
Matt Nash
580e2938d7
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00