[Opengeoscience-developers] OpenGeoscience branch, next, updated. 2050f528f01972d70396e4b6cebdead9004b2cb3

[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  2050f528f01972d70396e4b6cebdead9004b2cb3 (commit)
       via  cf16458a674c49ce5430b6c9580ba9cafab26b36 (commit)
       via  ceed7be3465a060118a155bc0bc2f5e5dc381be4 (commit)
       via  b7dbe281338f5f9dbe65b6307311a15a45c06f6b (commit)
      from  47ebbfe9664f9036b3683130ba0a966fc22a3a53 (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=2050f528f01972d70396e4b6cebdead9004b2cb3
commit 2050f528f01972d70396e4b6cebdead9004b2cb3
Merge: 47ebbfe cf16458
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Fri Jul 12 15:11:51 2013 -0400

    Merge remote-tracking branch 'origin/normalize_time_semi_merged' into next
    
    * origin/normalize_time_semi_merged:
      Removed debug messages
      Misc fixes
    
    Conflicts:
    	modules/vtk_reader.py
    	web/apps/archive/archive.js

 modules/mongo.py                  |    1 +
 modules/vtk_reader.py             |    4 --
 scripts/mongoimp.py               |    3 +-
 web/apps/archive/archive.js       |    6 +--
 web/lib/geo/archiveLayerSource.js |    8 ++++
 web/lib/geo/featureLayer.js       |   22 +++++++++-
 web/lib/geo/layer.js              |   85 +++++++++++++++++++++----------------
 7 files changed, 82 insertions(+), 47 deletions(-)

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

Summary of changes:
 modules/mongo.py                  |    1 +
 modules/vtk_reader.py             |    4 --
 scripts/mongoimp.py               |    3 +-
 web/apps/archive/archive.js       |    6 +--
 web/lib/geo/archiveLayerSource.js |    8 ++++
 web/lib/geo/featureLayer.js       |   22 +++++++++-
 web/lib/geo/layer.js              |   85 +++++++++++++++++++++----------------
 7 files changed, 82 insertions(+), 47 deletions(-)


hooks/post-receive
-- 
OpenGeoscience