[Opengeoscience-developers] OpenGeoscience branch, next, updated. 2d7c53e0e6dac2ef6349e93a2f6a55832bb9be7f

[Dave DeMarle]

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  2d7c53e0e6dac2ef6349e93a2f6a55832bb9be7f (commit)
       via  3ab079199dd8bd0c345737ea47b8ff930b5caf97 (commit)
       via  95d752fa3d99f53971d647c848b12be629d3c17f (commit)
      from  affa62e934b228f966224996423c6d6db16d7ed7 (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=2d7c53e0e6dac2ef6349e93a2f6a55832bb9be7f
commit 2d7c53e0e6dac2ef6349e93a2f6a55832bb9be7f
Merge: affa62e 3ab0791
Author: Dave DeMarle <dave.demarle at kitware.com>
Date:   Mon Jun 24 13:07:43 2013 -0400

    Merge branch 'normalize_time' into next
    
    Conflicts:
    	web/apps/archive/archive.js

 CMakeLists.txt              |    8 ++++++
 modules/vtk_reader.py       |   22 +++++++++++++---
 scripts/mongoimp.py         |   41 ++++++++++++++++++++++--------
 scripts/standardtime.py     |   57 +++++++++++++++++++++++++++++++++++++++++++
 web/apps/archive/archive.js |   15 +++++++----
 web/lib/ui/gis.js           |   13 +++++----
 6 files changed, 130 insertions(+), 26 deletions(-)

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

Summary of changes:
 CMakeLists.txt              |    8 ++++++
 modules/vtk_reader.py       |   22 +++++++++++++---
 scripts/mongoimp.py         |   41 ++++++++++++++++++++++--------
 scripts/standardtime.py     |   57 +++++++++++++++++++++++++++++++++++++++++++
 web/apps/archive/archive.js |   15 +++++++----
 web/lib/ui/gis.js           |   13 +++++----
 6 files changed, 130 insertions(+), 26 deletions(-)
 create mode 100644 scripts/standardtime.py


hooks/post-receive
-- 
OpenGeoscience