Ben Steffensmeier
e176478c7a
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 6c741a9ab3
[formerly 6c741a9ab3
[formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 86dffab17d
Former-commit-id: dfe8de96f2
2013-03-18 17:16:44 -05:00
Dave Hladky
cb5ee4a7b8
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 38b952a220
[formerly 38b952a220
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
3084a860cd
13.3.1-7 baseline
...
Former-commit-id: a72254cc75
[formerly a72254cc75
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Dave Hladky
29ed641a13
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
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/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: a1006667e0
[formerly a1006667e0
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
c6f379f59a
13.3.1-6 baseline
...
Former-commit-id: 3a4c7931e1
[formerly 3a4c7931e1
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Steve Harris
140ae3191c
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
2013-02-25 15:58:48 -06:00
Steve Harris
f3c3191a1c
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: a0573644c4
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Bryan Kowal
2a21f2624b
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: a8fb04f41c
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: 803397c7c7
Former-commit-id: 450e8e7a4c
2013-02-21 13:55:28 -06:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e8990021
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Steve Harris
5a33182da5
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: ea50a5db77
[formerly ea50a5db77
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
2013-02-19 12:22:00 -06:00
Steve Harris
edac913af7
13.2.1-8 baseline
...
Former-commit-id: f81b382c04
[formerly f81b382c04
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Ron Anderson
45627edcc7
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: a2a89fb4e7
[formerly a2a89fb4e7
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
2013-02-15 09:03:41 -06:00
Steve Harris
137e6e9d0e
Merge branch 'ss_builds' (13.2.1-7) into development
...
Former-commit-id: cc2757790c
[formerly cc2757790c
[formerly 62e4a9045e32eaaf1a52ff06d86f82d2693021bd]]
Former-commit-id: de437bb4fc
Former-commit-id: 3690662bf7
2013-02-12 15:30:10 -06:00
Steve Harris
7a97ba36cb
13.2.1-7 baseline
...
Former-commit-id: 2fb5a31b98
[formerly 2fb5a31b98
[formerly 85a6ac3debfd1691b5d44c547d76a7ae9e19523f]]
Former-commit-id: 6baff6a089
Former-commit-id: bac9b967aa
2013-02-12 15:27:30 -06:00
Steve Harris
94dd16659a
13.2.1-7 baseline
...
Former-commit-id: 6fad5da5ed
[formerly 6fad5da5ed
[formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 6bfbfc8a5e
2013-02-12 14:51:26 -06:00
Steve Harris
d73efe8e86
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 4bc8e9ab5c
[formerly 4bc8e9ab5c
[formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ad515e28f
2013-02-06 11:12:01 -06:00
Steve Harris
f028c16f79
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: a16ac7819c
[formerly a16ac7819c
[formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: 6c6b53679b
Former-commit-id: 28ddc9bad8
2013-02-06 11:08:53 -06:00
Steve Harris
bb0759d5ad
13.2.1-5 baseline
...
Former-commit-id: 232734091d
[formerly 232734091d
[formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
2013-02-06 11:02:32 -06:00
Bryan Kowal
2fafc6a34b
Issue #1577 - deploy-install and AWIPS II ant task updates
...
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring
Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f
Former-commit-id: 7815b651bb
[formerly 7815b651bb
[formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 99994d3151
2013-02-05 13:25:15 -06:00
Steve Harris
0a4ef8c084
13.2.1-4 baseline
...
Former-commit-id: 8f2e7d4437
[formerly 8f2e7d4437
[formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 2998f750f4
2013-01-31 11:40:31 -06:00
Steve Harris
27706b8dcb
13.2.1-2 baseline
...
Former-commit-id: 7a7f7c45ca
[formerly 7a7f7c45ca
[formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
2013-01-25 09:07:12 -06:00
Steve Harris
547c1dedd1
13.2.1-2 baseline
...
Former-commit-id: 83e9157df7
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
9146e727f9
13.2.1-1 baseline
...
Former-commit-id: 9771dfae6b
[formerly 9771dfae6b
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
2013-01-23 11:13:03 -05:00
Steve Harris
5c488932d9
13.1.2-10 baseline
...
Former-commit-id: 68dde17de2
[formerly 68dde17de2
[formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]
Former-commit-id: 86ea0b666e
Former-commit-id: d148beb4ca
2013-01-18 10:37:25 -05:00
Bryan Kowal
0c5323fadb
Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
...
Former-commit-id: a2f745ec54
[formerly a2f745ec54
[formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]]
Former-commit-id: 5d769d8a8d
Former-commit-id: 2bb5377a4d
2013-01-17 09:59:11 -06:00
Bryan Kowal
e9e16abea2
Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
...
Former-commit-id: 2ed28bed93
[formerly 2ed28bed93
[formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]]
Former-commit-id: 8c118e791b
Former-commit-id: 0a39b4ddf1
2013-01-15 18:46:46 -06:00
Bryan Kowal
34518b7cf6
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 02c16b6f3d
[formerly 02c16b6f3d
[formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]]
Former-commit-id: d710e987e4
Former-commit-id: 37d1aee965
2013-01-15 16:09:42 -06:00
Bryan Kowal
290167ac16
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: e2a12845d3
[formerly e2a12845d3
[formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: 4db9c6c321
Former-commit-id: c1330e8121
2013-01-15 14:56:01 -06:00
Richard Peter
096134d917
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 1318f53902
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: b8e42dabc0
Former-commit-id: aa9e16b038
2013-01-14 17:38:38 -06:00
Steve Harris
066c14dcd2
13.1.2-8 baseline
...
Former-commit-id: e6217a17de
[formerly e6217a17de
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 3caf592e83
2013-01-11 16:19:07 -05:00
Steve Harris
775a338b90
13.1.2-7 baseline
...
Former-commit-id: 4f86b07eb0
[formerly 4f86b07eb0
[formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
8fb09ab2cb
Issue #1362 add null chack in nsharp mouse handler.
...
Former-commit-id: 1186724fa8
[formerly 1186724fa8
[formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]
Former-commit-id: a836aee481
Former-commit-id: 3a4661685a
2013-01-08 18:17:24 -06:00
Steve Harris
05bdc0ecd2
13.1.2-6 baseline
...
Former-commit-id: 8e5f9e0e6c
[formerly 8e5f9e0e6c
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
b6fa9b4858
13.1.2-2 baseline
...
Former-commit-id: c0c1d56f3a
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Max Schenkelberg
09f1499af9
Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
...
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde
Former-commit-id: fabb9bbcff
[formerly fabb9bbcff
[formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]
Former-commit-id: 7e3273db95
Former-commit-id: 904270b99b
2012-12-20 17:14:34 -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
Steve Harris
ec2cdc1593
12.12.1-8 baseline
...
Former-commit-id: 19962f41ba
[formerly 19962f41ba
[formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
2012-12-06 09:02:51 -06:00
Max Schenkelberg
b8b98a78c3
Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
...
Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die
Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6
Former-commit-id: b648c5828e
[formerly b648c5828e
[formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: ed77d56a84
Former-commit-id: b24440cc37
2012-11-29 10:29:36 -06:00
Nate Jensen
25602f0183
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: 49c2079963
[formerly 49c2079963
[formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 31637efbbc
Former-commit-id: 8944e220f6
2012-11-14 16:09:00 -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
Ben Steffensmeier
84abe4fa4f
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 2c8f3f09ac
[formerly 2c8f3f09ac
[formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2d864c3b09
Former-commit-id: 91254adfd6
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
40a07f8998
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: e6b0751f5c
[formerly e6b0751f5c
[formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: fbed67a208
Former-commit-id: 7c9341a3a6
2012-11-08 14:34:55 -06:00
Dustin Johnson
6613c51d3b
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: 064ef82d1e
[formerly 064ef82d1e
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -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
Richard Peter
940d986f6d
Issue #1257 : Update PurgeRules to not be hard linked to path keys
...
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: 275398778f
[formerly 275398778f
[formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 886375172b
Former-commit-id: bd1d87363a
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
38b0dafe0b
merge branch Unifeid_Grid into developement
...
Former-commit-id: d0a2ed32b5
[formerly d0a2ed32b5
[formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
dd5ab10b61
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 6a9ff88b33
[formerly 6a9ff88b33
[formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
3f608d0843
Issue #189 modify nsharp to use grid data.
...
Former-commit-id: 52c37c114a
[formerly 52c37c114a
[formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]]
Former-commit-id: db1efee514
Former-commit-id: b9cd33b79b
2012-10-24 13:07:41 -05:00