[Opengeoscience-developers] OpenGeoscience branch, next, updated. 08b5bda1d26e0312c0bf3543767e35e50520dad2

[Ben Burnett]

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, next has been updated
       via  08b5bda1d26e0312c0bf3543767e35e50520dad2 (commit)
       via  c189c9e89ce7bfe4b87ba5aae4a5e183cf82949e (commit)
       via  22ad3d96f180f03d509255d28dddf43c159cc96f (commit)
       via  e7502aadd148c259fac0627717a897f9c78d9253 (commit)
      from  47d871b3a715c986952dc92cd1f56d065c91022e (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=08b5bda1d26e0312c0bf3543767e35e50520dad2
commit 08b5bda1d26e0312c0bf3543767e35e50520dad2
Merge: 22ad3d9 c189c9e
Author: Ben Burnett <bburnett at poly.edu>
Date:   Wed May 8 15:12:31 2013 -0400

    Merge branch 'bug_49_globe_rendering' into next

 web/apps/archive/archive.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=22ad3d96f180f03d509255d28dddf43c159cc96f
commit 22ad3d96f180f03d509255d28dddf43c159cc96f
Merge: 47d871b e7502aa
Author: Ben Burnett <bburnett at poly.edu>
Date:   Wed May 8 15:03:55 2013 -0400

    Merge branch 'bug_49_globe_rendering' into next
    
    Conflicts:
    	web/lib/ui/gis.js

 web/lib/geo/ellipsoid.js                |   46 ++++------
 web/lib/geo/map.js                      |   51 +++++------
 web/lib/geo/mapInteractorStyle.js       |    9 +-
 web/lib/ui/gis.js                       |  149 +++++++++++++++++--------------
 web/lib/vgl/camera.js                   |   39 ++++----
 web/lib/vgl/geomData.js                 |   30 +++++--
 web/lib/vgl/mapper.js                   |   29 +++---
 web/lib/vgl/renderer.js                 |   96 +++++++++-----------
 web/lib/vgl/trackballInteractorStyle.js |    9 +-
 web/lib/vgl/viewer.js                   |    1 +
 10 files changed, 230 insertions(+), 229 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 web/apps/archive/archive.js             |    2 +-
 web/lib/geo/ellipsoid.js                |   46 ++++------
 web/lib/geo/map.js                      |   51 +++++------
 web/lib/geo/mapInteractorStyle.js       |    9 +-
 web/lib/ui/gis.js                       |  149 +++++++++++++++++--------------
 web/lib/vgl/camera.js                   |   39 ++++----
 web/lib/vgl/geomData.js                 |   30 +++++--
 web/lib/vgl/mapper.js                   |   29 +++---
 web/lib/vgl/renderer.js                 |   96 +++++++++-----------
 web/lib/vgl/trackballInteractorStyle.js |    9 +-
 web/lib/vgl/viewer.js                   |    1 +
 11 files changed, 231 insertions(+), 230 deletions(-)


hooks/post-receive
-- 
OpenGeoscience