[Opengeoscience-developers] OpenGeoscience branch, master, updated. 253d54ef8e041ce6e57330815dab05b64ed88a73

[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, master has been updated
       via  253d54ef8e041ce6e57330815dab05b64ed88a73 (commit)
       via  e212f19762ea8e8ab7e0d3d764eebbfd03a6df25 (commit)
      from  8c32313aa30372522cf63aeb88bcf633a9329cf1 (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=253d54ef8e041ce6e57330815dab05b64ed88a73
commit 253d54ef8e041ce6e57330815dab05b64ed88a73
Merge: 8c32313 e212f19
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Thu May 30 15:59:12 2013 -0400

    Merge remote-tracking branch 'origin/select_timestep_and_variables'
    
    * 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       |   42 ++++++++++++++++++++++++++----------------
 scripts/mongoimp.py         |    9 +++++++--
 web/apps/archive/archive.js |   16 ++++++++++++++--
 web/lib/ui/gis.js           |   25 ++++++++++++++++++++++++-
 6 files changed, 78 insertions(+), 27 deletions(-)

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

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


hooks/post-receive
-- 
OpenGeoscience