[Opengeoscience-developers] OpenGeoscience branch, next, updated. 1e2b90ec99999fa12cfadd4d1ed88645f1cb0850

[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  1e2b90ec99999fa12cfadd4d1ed88645f1cb0850 (commit)
       via  6451e3e330d997f47f9faec340ccb92fd7a1999d (commit)
       via  4e9e3d946a5c7d23873079efe1f16f0f124f59d8 (commit)
       via  146f60d177d3344b438c6cb91f2db6060e232fd1 (commit)
       via  0750740c2a6b38e68632b37213059861e2b71ea8 (commit)
       via  633c984e92045da2781b1c37fa2beae9705ca609 (commit)
       via  34dc5d4d24f8fbc88c4e8db2b5c3064f1ea10ac2 (commit)
       via  0f08925781e315512af3a60ed7cfbb7153b9cff3 (commit)
       via  6ab2a890dd5f332900436e4011fee4fe5d6e9dac (commit)
       via  8eb783a146d404c64ee2527bb11947fbc91b0fc4 (commit)
       via  6796d63b107d7d0b400b0ffe8e338259720f4314 (commit)
       via  ec9aa13cb861c32a59b3072aa2ff627b198af15f (commit)
       via  962ba665719a63ff76cf3f36cdb65b8775f7a295 (commit)
       via  817cf22925bb19d0cc6d179858489b1c59302e76 (commit)
      from  f41220a6d010beb0844ac89673464fdd4e3df0c3 (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=1e2b90ec99999fa12cfadd4d1ed88645f1cb0850
commit 1e2b90ec99999fa12cfadd4d1ed88645f1cb0850
Merge: f41220a 6451e3e
Author: Ben Burnett <bburnett at poly.edu>
Date:   Wed Jul 10 17:10:53 2013 -0400

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

 CMakeLists.txt                    |    2 +
 web/apps/archive/archive.js       |   26 +-
 web/apps/archive/index.html       |   17 +-
 web/apps/archive/workflow.html    |   32 ++
 web/apps/archive/workflow.js      |  449 +++--------------
 web/apps/archive/workflowStyle.js |   16 +-
 web/lib/ui/workflow.js            | 1044 +++++++++++++++++++++++++++++++++++++
 7 files changed, 1188 insertions(+), 398 deletions(-)

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

Summary of changes:
 CMakeLists.txt                    |    2 +
 web/apps/archive/archive.js       |   26 +-
 web/apps/archive/index.html       |   17 +-
 web/apps/archive/workflow.html    |   32 ++
 web/apps/archive/workflow.js      |  449 +++--------------
 web/apps/archive/workflowStyle.js |   16 +-
 web/lib/ui/workflow.js            | 1044 +++++++++++++++++++++++++++++++++++++
 7 files changed, 1188 insertions(+), 398 deletions(-)
 create mode 100644 web/apps/archive/workflow.html
 create mode 100644 web/lib/ui/workflow.js


hooks/post-receive
-- 
OpenGeoscience