[Opengeoscience-developers] OpenGeoscience branch, wip_flatmap, updated. 4e92605afc99ce80a7c9701d140b0ec39b8970f1

[Wendel Silva]

Aashish,

Can you check wip_flatmap to see if it can merge with next?

Thanks

Wendel B Silva


On Wed, Jun 5, 2013 at 1:14 PM, Wendel Silva <wendelbsilva at gmail.com> wrote:

> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "OpenGeoscience".
>
> The branch, wip_flatmap has been updated
>        via  4e92605afc99ce80a7c9701d140b0ec39b8970f1 (commit)
>        via  cc1dab39d5867a7bae18769c92fdb27949e92ffc (commit)
>        via  d84c2f72303e5aa016313fac423ebaa16507713e (commit)
>        via  720b413f903a2c159830495dbcf9c617c7fc62be (commit)
>        via  40561607aadfbd2ed8d4168bbbc36eb2e93c81c2 (commit)
>        via  63fc5356284f9166f57102631a931b326c72089a (commit)
>        via  d9f454147b47595b73f19ff0f7574fd99e1554e8 (commit)
>        via  9257e00b674be1f0f9a466759e955e8e42dfbbce (commit)
>        via  36d0927a93d4e12c900931e7a02d740148f5f516 (commit)
>        via  151f0b944ae9f1bfc0ebad8b9e1396553f9f6b86 (commit)
>        via  eb81cbab58e2886f4080bec453c64aaab16f853a (commit)
>        via  d52238a8329cf34f3362e1e2a31373a4c8d78ded (commit)
>        via  cded69a3b806cbd32367aea82edae62fd306d8fc (commit)
>        via  f1ac3d4fd076ffd5417173c44dc3ecdad48b447e (commit)
>        via  8184baa70c8eb488e41aa7c9fc4a0a869c6c40c2 (commit)
>        via  44e9bc446419e7b6f5170dd001d4a6e8c752dfcf (commit)
>        via  52493aaa1317a292f873ac75940af0b7d702d221 (commit)
>        via  1bc179cdbb26fd886f916f7670e673330139ded4 (commit)
>        via  bb51183c6875bd006a42b65ff3a6891b950930d6 (commit)
>        via  65093dd709b479b982eee08e3da547b66d9ae871 (commit)
>        via  4216f4aa53adaa53729de32d109aea11c19a17be (commit)
>        via  61ac05795e6d870a081feb72b00f0a32ae2b1b16 (commit)
>        via  9230c6147a306171db3aebfd771ef0f6be85500e (commit)
>        via  578a754726550933b2556392f7c0208208b11f5c (commit)
>        via  b878a03e7cd064fb02c63d5f606d1fa771504c45 (commit)
>        via  49636c284602912bbad0cf80dca8c44ab12bcaed (commit)
>        via  095e61f4be459e2c353750005c949e8d8a2e594f (commit)
>        via  03d463ea902328b0ba0654d27de98aa05d6087ea (commit)
>        via  253d54ef8e041ce6e57330815dab05b64ed88a73 (commit)
>        via  8c32313aa30372522cf63aeb88bcf633a9329cf1 (commit)
>       from  6e9abb336bf6b7992b42d82d0a57b5e3c70d9d35 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
>
> http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=4e92605afc99ce80a7c9701d140b0ec39b8970f1
> commit 4e92605afc99ce80a7c9701d140b0ec39b8970f1
> Merge: 6e9abb3 cc1dab3
> Author: Wendel Bezerra Silva <wendelbsilva at gmail.com>
> Date:   Wed Jun 5 13:11:20 2013 -0400
>
>     Merge branch 'next' of public.kitware.com:OpenGeoscience/geoweb into
> wip_flatmap
>
>  CMakeLists.txt                    |    8 +
>  modules/vtk_reader.py             |    8 +-
>  web/apps/archive/archive.js       |  143 +++++++-----------
>  web/apps/archive/index.html       |    2 +
>  web/common/js/tween.min.js        |   13 ++
>  web/lib/geo/archiveLayerSource.js |  119 +++++++++++++++
>  web/lib/geo/command.js            |    2 +
>  web/lib/geo/feature.js            |   36 ++++-
>  web/lib/geo/layer.js              |  299
> +++++++++++++++++++++++++++++--------
>  web/lib/geo/layerFeatures.js      |   83 ++++++++++
>  web/lib/geo/layerSource.js        |   51 +++++++
>  web/lib/geo/map.js                |  130 +++++++++++++++-
>  web/lib/vgl/data.js               |   21 +++
>  web/lib/vgl/geomData.js           |   46 ++++++-
>  web/lib/vgl/groupNode.js          |    9 +
>  web/lib/vgl/renderer.js           |   38 +++++-
>  16 files changed, 835 insertions(+), 173 deletions(-)
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>  CMakeLists.txt                    |    8 +
>  modules/vtk_reader.py             |    8 +-
>  web/apps/archive/archive.js       |  143 +++++++-----------
>  web/apps/archive/index.html       |    2 +
>  web/common/js/tween.min.js        |   13 ++
>  web/lib/geo/archiveLayerSource.js |  119 +++++++++++++++
>  web/lib/geo/command.js            |    2 +
>  web/lib/geo/feature.js            |   36 ++++-
>  web/lib/geo/layer.js              |  299
> +++++++++++++++++++++++++++++--------
>  web/lib/geo/layerFeatures.js      |   83 ++++++++++
>  web/lib/geo/layerSource.js        |   51 +++++++
>  web/lib/geo/map.js                |  130 +++++++++++++++-
>  web/lib/vgl/data.js               |   21 +++
>  web/lib/vgl/geomData.js           |   46 ++++++-
>  web/lib/vgl/groupNode.js          |    9 +
>  web/lib/vgl/renderer.js           |   38 +++++-
>  16 files changed, 835 insertions(+), 173 deletions(-)
>  create mode 100644 web/common/js/tween.min.js
>  create mode 100644 web/lib/geo/archiveLayerSource.js
>  create mode 100644 web/lib/geo/layerFeatures.js
>  create mode 100644 web/lib/geo/layerSource.js
>  create mode 100644 web/lib/vgl/data.js
>
>
> hooks/post-receive
> --
> OpenGeoscience
> _______________________________________________
> Opengeoscience-developers mailing list
> Opengeoscience-developers at public.kitware.com
>
> http://public.kitware.com/cgi-bin/mailman/listinfo/opengeoscience-developers
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/opengeoscience-developers/attachments/20130605/a7d7f8bf/attachment.html>