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

[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  b270908d48c39f07b14d8903b096066e6e112cf5 (commit)
       via  e212f19762ea8e8ab7e0d3d764eebbfd03a6df25 (commit)
      from  7abb3c436cd3cff2aabc684163a8f4aa9a1d4ce4 (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=b270908d48c39f07b14d8903b096066e6e112cf5
commit b270908d48c39f07b14d8903b096066e6e112cf5
Merge: 7abb3c4 e212f19
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Thu May 30 15:33:02 2013 -0400

    Merge remote-tracking branch 'origin/select_timestep_and_variables' into next
    
    * origin/select_timestep_and_variables:
      Allow user to choose specific time and variables.
    
    Conflicts:
    	modules/vtk_reader.py

 modules/geodata.py          |    9 +++++----
 modules/reader.py           |    4 ++--
 modules/vtk_reader.py       |   41 +++++++++++++++++++++++++----------------
 scripts/mongoimp.py         |    9 +++++++--
 web/apps/archive/archive.js |   16 ++++++++++++++--
 web/lib/ui/gis.js           |   25 ++++++++++++++++++++++++-
 6 files changed, 77 insertions(+), 27 deletions(-)

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

Summary of changes:
 modules/geodata.py          |    9 +++++----
 modules/reader.py           |    4 ++--
 modules/vtk_reader.py       |   41 +++++++++++++++++++++++++----------------
 scripts/mongoimp.py         |    9 +++++++--
 web/apps/archive/archive.js |   16 ++++++++++++++--
 web/lib/ui/gis.js           |   25 ++++++++++++++++++++++++-
 6 files changed, 77 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
OpenGeoscience