xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1601 commits 31 branches 40 tags 3.8 GiB
Commit graph

154 commits

Author SHA1 Message Date
Bryan Kowal
0136f9d5a3 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline 
Former-commit-id: c8a43edd9e [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 146c43a606
 2013-01-07 12:16:01 -06:00
Bryan Kowal
ad30a7fb6a Issue #1373 - prevent file naming conflicts 
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: 9079c2dd3f [formerly 9079c2dd3f [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 6580901b03
 2013-01-05 10:40:10 -06:00
Bryan Kowal
d2cd60bb5c Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms 
Former-commit-id: 9062ed93d7 [formerly 9062ed93d7 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]
Former-commit-id: e131b5bc72
Former-commit-id: 8a4bc85bad
 2013-01-04 12:50:37 -06:00
Richard Peter
6fd64a20fa Issue #1373: Update jvm startup to load a service list for services to start. 
Former-commit-id: 1c560f5013 [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]
Former-commit-id: c1765f776c
Former-commit-id: 424cb12ef6
 2013-01-03 16:27:32 -06:00
Richard Peter
7c4641be8e Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development 
Former-commit-id: c3e9f40479 [formerly c3e9f40479 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]
Former-commit-id: 45f901c1b0
Former-commit-id: 54778e7490
 2012-12-18 13:08:40 -06:00
Roger Ferrel
95e6d9e752 Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly. 
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: 0c5d10e66a [formerly 0c5d10e66a [formerly c1567c66f77077f9411a04f349a17d368424db5f]]
Former-commit-id: 43fd607a30
Former-commit-id: 6d4946290f
 2012-12-18 09:00:46 -06:00
Bryan Kowal
bf96e5cf59 Issue #1416: added the python package shapely 
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: 8d1e29448a [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]
Former-commit-id: 5e22c24657
Former-commit-id: 6103e7c485
 2012-12-17 15:27:43 -06:00
Bryan Kowal
f256955776 Issue #1262: 
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 660a9b615f [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]
Former-commit-id: f39489c44c
Former-commit-id: c44c4bd061
 2012-12-16 21:40:26 -06:00
Richard Peter
463f7c5d9b Revert "Issue #1262:" 
This reverts commit 83e1f8cc0a [formerly 9490652103] [formerly 0970259114] [formerly a210f08acc [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]


Former-commit-id: 9a7cfa2383 [formerly 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]
Former-commit-id: f37f948456
Former-commit-id: 48641ca26f
 2012-12-16 20:37:21 -06:00
Bryan Kowal
83e1f8cc0a Issue #1262: 
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib


Former-commit-id: a210f08acc [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]
Former-commit-id: 0970259114
Former-commit-id: 9490652103
 2012-12-13 12:40:31 -06:00
Roger Ferrel
d7a28eedfd Issue #1411 Change suggest by Dale Morris for pqact.conf.template. 
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: b677a5ba3d [formerly b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]]
Former-commit-id: aefa650cda
Former-commit-id: f64a99d554
 2012-12-11 15:43:54 -06:00
Steve Harris
ebcc9975c4 Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 43ddfe98c4 [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
 2012-12-11 08:45:53 -06:00
Bryan Kowal
ced865ade3 Issue #1392 - update tar directory access paths for awips2-edex-native 
Former-commit-id: 73e0f4b278 [formerly 73e0f4b278 [formerly 65d91d9235a76c5ee82450d3dd6332f92e29c326]]
Former-commit-id: 6ff82d812e
Former-commit-id: 43f888ccb8
 2012-12-05 10:15:37 -06:00
Bryan Kowal
774d3a8f8d Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features 
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf

Former-commit-id: d3b455c955 [formerly d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]
Former-commit-id: f99d351995
Former-commit-id: b0c65323b6
 2012-11-28 16:30:10 -06:00
Bryan Kowal
dbe78374bc Issue #1318 - updated ncep database rpm specification file 
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832

Former-commit-id: b60dda550c [formerly b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]
Former-commit-id: fe9dcaa216
Former-commit-id: 67c3c140e3
 2012-11-15 10:24:38 -06:00
Bryan Kowal
954534e3d0 Issue #1318 - updated ncep database rpm specification file 
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9

Former-commit-id: 99399e880e [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]
Former-commit-id: 24074da383
Former-commit-id: 3d123e08a7
 2012-11-15 09:26:46 -06:00
Dustin Johnson
ff33643234 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: bff32bbe58 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
 2012-11-14 14:41:57 -06:00
Steve Harris
493f335c0b 12.12.1-4 baseline 
Former-commit-id: 85130eb611 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
 2012-11-14 14:19:20 -06:00
Steve Harris
59efd9a217 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 448dd1c35f [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
 2012-11-13 17:28:50 -06:00
Steve Harris
96a4a4f3f5 12.12.1-2 baseline 
Former-commit-id: a8560580f8 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
 2012-11-13 17:14:24 -06:00
Steve Harris
a5be98d6de 12.12.1-1 baseline 
Former-commit-id: e4bd20a515 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Dustin Johnson
4d9c945388 Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 98d7beae50 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Steve Harris
e9e3bdbec2 Merge branch 'ss_builds' into development 
Former-commit-id: fb46bb053d [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: afb534db67
Former-commit-id: 048c0c88cd
 2012-10-29 12:17:12 -05:00
Steve Harris
09f6e43195 12.11.1-12 baseline 
Former-commit-id: 8682e4f6ca [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
 2012-10-29 12:15:56 -05:00
Steve Harris
20e87549c0 Merge branch 'ss_builds' (12.11.1-7) into development 
Former-commit-id: b7406a55cc [formerly b7406a55cc [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]
Former-commit-id: 38b9c03f5e
Former-commit-id: 9d038186d1
 2012-10-23 16:43:09 -05:00
Steve Harris
572085c119 12.11.1-7 baseline 
Former-commit-id: d8ca6b9005 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
 2012-10-23 16:40:50 -05:00
Steve Harris
8a17564ba3 Merge branch 'ss_builds' (12.11.1-6) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: a7337d9160 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: 1807100932
Former-commit-id: 892e4df811
 2012-10-18 16:01:05 -05:00
Steve Harris
4f27cbb406 12.11.1-6 baseline 
Former-commit-id: fba4a443a0 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
 2012-10-18 15:53:01 -05:00
Steve Harris
dff8d5de9c 12.11.1-5 baseline 
Former-commit-id: 03f3f3c36a [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
 2012-10-18 15:46:42 -05:00
Richard Peter
88b80f406d Merge "Issue #1265 remove pypies gzip handling" into development 
Former-commit-id: 3723250e50 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]
Former-commit-id: cd9306a537
Former-commit-id: c7894c5cda
 2012-10-17 14:07:28 -05:00
Nate Jensen
60ad3b55f2 Issue #1265 remove pypies gzip handling 
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5

Former-commit-id: fa3e87549a [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]
Former-commit-id: 2dac2f5dde
Former-commit-id: 740146d838
 2012-10-17 11:32:49 -05:00
Steve Harris
b28a8e5113 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development 
Former-commit-id: a63b40b17a [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]
Former-commit-id: 5e5c98b193
Former-commit-id: be16909d2d
 2012-10-16 21:44:49 -05:00
Steve Harris
ad78266035 Merge branch 'ss_builds' (12.11.1-4) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: 4610ecc513 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
 2012-10-16 15:48:14 -05:00
Steve Harris
560f0d9cc3 12.11.1-4 baseline 
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Greg Armendariz
041b833d53 Merge changes Ibe8b9a97,If48f637e into development 
* changes:
  Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
  Issue #1252 - Updated with changes from Dale Morris


Former-commit-id: d1772b3705 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]
Former-commit-id: b8de817d68
Former-commit-id: 2c058c6b8a
 2012-10-16 12:59:00 -05:00
Nate Jensen
319c4cda2b Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default 
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: f2cbf0c5c3 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
 2012-10-12 15:16:27 -05:00
James Korman
5659c72222 Issue #1252 - Checked in wrong file. Deleting it. 
Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37

Former-commit-id: aca18f0a37 [formerly aca18f0a37 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]
Former-commit-id: fd783767b2
Former-commit-id: 31be9c204d
 2012-10-12 14:48:59 -05:00
James Korman
add08a1c0d Issue #1252 - Updated with changes from Dale Morris 
Former-commit-id: 2fad414d6d [formerly 2fad414d6d [formerly f48f637e60f7537da42681dc001332257a046d2b]]
Former-commit-id: 20c61590a4
Former-commit-id: 4ce298e736
 2012-10-12 14:48:59 -05:00
Steve Harris
8c81601905 Merge branch 'ss_builds' (12.11.1-2) into development 
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: 8c97afe03b [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]
Former-commit-id: 0895f22690
Former-commit-id: 8dae024430
 2012-10-08 13:29:34 -05:00
Steve Harris
e72b6d5da6 12.11.1-2 baseline 
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: c12ee14e66 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
 2012-10-08 13:26:20 -05:00
Steve Harris
67c18fd17d Issue #1250 - Modified the comp.xml files adding kml-export 
Change-Id: I53bcbf3199013f02db1ea83c5e665912d6232761

Former-commit-id: d0c760764f [formerly d0c760764f [formerly 252fbc2ff9e34300c2176a6c149c3af9a523321c]]
Former-commit-id: 9552a60f54
Former-commit-id: a94cb4c7bd
 2012-10-05 10:06:16 -05:00
Steven Harris
a544be6d83 12.11.1-1 baseline 
Former-commit-id: 618aa3f316 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Steve Harris
a20533b551 Merge branch 'ss_builds' (12.10.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 8354ca4e68 [formerly 8354ca4e68 [formerly 4ebdc29db766db49df46d568a320c1743d0bb7c0]]
Former-commit-id: 3827a78a7b
Former-commit-id: f5f59b6aa5
 2012-09-25 10:31:57 -05:00
Steve Harris
e39023bb85 12.10.1-6 baseline 
Former-commit-id: cebe6534ae [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: ba648f8e72
Former-commit-id: 5d5a61bd75
 2012-09-25 10:14:23 -05:00
Steve Harris
f80fb62837 Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 29e7427dc3 [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 04d9735c8f
Former-commit-id: 53673f63e6
 2012-09-13 13:26:13 -05:00
Steve Harris
26b7d083ec 12.10.1-4 baseline 
Former-commit-id: fd19ca5624 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00
Steve Harris
faadb51529 12.10.1-3 baseline 
Former-commit-id: 21f430062b [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
 2012-09-11 16:00:38 -05:00
Greg Armendariz
84b24812c2 Merge "Issue #1090 - pattern corrections" into development 
Former-commit-id: 8201f5346f [formerly 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]
Former-commit-id: 58b74d05e5
Former-commit-id: 338f0ebd91
 2012-09-06 13:50:36 -05:00
Steve Harris
ab4d9d7b75 Issue #1141 - Adding JavaAPIforKml license file 
Former-commit-id: 7d7f20b388 [formerly 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]
Former-commit-id: 259bb4dfed
Former-commit-id: b9317a53c7
 2012-09-06 11:09:24 -05:00
James Korman
4b3126493d Issue #1090 - pattern corrections 
Former-commit-id: be350dd763 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]
Former-commit-id: eb17151f74
Former-commit-id: f36d089fd5
 2012-09-06 09:20:03 -05:00