[Opengeoscience-developers] OpenGeoscience branch, next, updated. e44be922cd0863d91d672cecb738be24e57bb1a5

[Aashish Chaudhary]

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  e44be922cd0863d91d672cecb738be24e57bb1a5 (commit)
       via  fc866e472cab64ddc980b3e29ad60baec8fb5409 (commit)
       via  6a7312f227d58654529db47e44712af7335da746 (commit)
       via  582344b05d1a580d32d5a022c0d493413d649920 (commit)
       via  2bcd5d9b139585cb67b8c0f1508d4943560d9616 (commit)
      from  2a497e8192485ab4dc14b44133511a572092ed46 (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=e44be922cd0863d91d672cecb738be24e57bb1a5
commit e44be922cd0863d91d672cecb738be24e57bb1a5
Merge: 2a497e8 fc866e4
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Tue May 21 09:37:36 2013 -0400

    Merge remote-tracking branch 'origin/colormap_rebased' into next
    
    * origin/colormap_rebased:
      brought back solid color shader and cleaned up detection of scalar type
      Removed shader that hard-coded the color
      Added API to set / get scalar format
      Comments and fixes
    
    Conflicts:
    	web/lib/geo/map.js

 web/lib/geo/feature.js       |   23 +++++++++++-------
 web/lib/geo/map.js           |   26 +++++++++++---------
 web/lib/vgl/geojsonReader.js |   31 +++++++++---------------
 web/lib/vgl/geomData.js      |   33 ++++++++++++++++++++++++++
 web/lib/vgl/utils.js         |   52 +++++++++++++++++++++++++++++++++--------
 5 files changed, 115 insertions(+), 50 deletions(-)

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

Summary of changes:
 web/lib/geo/feature.js       |   23 +++++++++++-------
 web/lib/geo/map.js           |   26 +++++++++++---------
 web/lib/vgl/geojsonReader.js |   31 +++++++++---------------
 web/lib/vgl/geomData.js      |   33 ++++++++++++++++++++++++++
 web/lib/vgl/utils.js         |   52 +++++++++++++++++++++++++++++++++--------
 5 files changed, 115 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
OpenGeoscience