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

[Ben Burnett]

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  affa62e934b228f966224996423c6d6db16d7ed7 (commit)
       via  d3cbf35b96529740ea540ee30e7d92ad629f69e1 (commit)
       via  cf744268922d2c8e286103a98c828ff3e4627047 (commit)
       via  151dd9b97b710b17de21fc0d6185351cd9f4738a (commit)
      from  f94f1f5d5b9dbc02588e4d0c4607447345f180a6 (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=affa62e934b228f966224996423c6d6db16d7ed7
commit affa62e934b228f966224996423c6d6db16d7ed7
Merge: f94f1f5 d3cbf35
Author: Ben Burnett <bburnett at poly.edu>
Date:   Wed Jun 19 18:29:58 2013 -0400

    Merge branch '54-workflow-support-fix' into next
    
    Conflicts:
    	web/apps/archive/archive.js

 web/apps/archive/10yearAverage.js  |    1 +
 web/apps/archive/archive.js        |   23 +-
 web/apps/archive/geowebRegistry.js | 2384 ++++++++++++++++++++++++++++++++++++
 web/apps/archive/index.html        |   13 +
 web/apps/archive/workflow.css      |   27 +
 web/apps/archive/workflow.js       |  555 +++++++++
 web/apps/archive/workflowStyle.js  |   28 +
 web/lib/geo/map.js                 |    8 +-
 web/lib/ui/gis.js                  |   12 +-
 9 files changed, 3045 insertions(+), 6 deletions(-)

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

Summary of changes:
 web/apps/{workflow => archive}/10yearAverage.js  |    0
 web/apps/archive/archive.js                      |   23 +++++++++++++++++-
 web/apps/{workflow => archive}/geowebRegistry.js |    0
 web/apps/archive/index.html                      |   13 ++++++++++
 web/apps/{workflow => archive}/workflow.css      |    0
 web/apps/{workflow => archive}/workflow.js       |   28 +++++++++++-----------
 web/apps/{workflow => archive}/workflowStyle.js  |    0
 web/lib/geo/map.js                               |    8 +++---
 web/lib/ui/gis.js                                |   12 ++++++++-
 9 files changed, 64 insertions(+), 20 deletions(-)
 copy web/apps/{workflow => archive}/10yearAverage.js (100%)
 copy web/apps/{workflow => archive}/geowebRegistry.js (100%)
 copy web/apps/{workflow => archive}/workflow.css (100%)
 copy web/apps/{workflow => archive}/workflow.js (97%)
 copy web/apps/{workflow => archive}/workflowStyle.js (100%)


hooks/post-receive
-- 
OpenGeoscience