[Opengeoscience-developers] OpenGeoscience branch, 54-2-workflow-construction, updated. 76f05c426699394aa21b4f65b0510a1cd96e4f0f

[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, 54-2-workflow-construction has been updated
       via  76f05c426699394aa21b4f65b0510a1cd96e4f0f (commit)
       via  370e41dd3a91537789f7cea782044d017ffc61e9 (commit)
       via  5c4d14a0aa4ca81aea5418059f70dd72b88dca88 (commit)
       via  dbdbbb2f3b2cc84e4858a3d1f1dbd1e81a4038f6 (commit)
       via  421bec97d087cb1a5570a9b37d7eb23ad41e6596 (commit)
       via  b25ab8a88a1f6c55c8dc0352348578df40781d60 (commit)
       via  012f67f40851bd84158538ba159e8dc33e6ff26d (commit)
       via  ad5982e0a9e7c4cc4d954728459e5f041df52d7d (commit)
       via  643f6b048201e94a531cd431f0ffb5346db6e53f (commit)
      from  f96bfdda8068d21d2a6244501ceddc990292a2a3 (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=76f05c426699394aa21b4f65b0510a1cd96e4f0f
commit 76f05c426699394aa21b4f65b0510a1cd96e4f0f
Merge: f96bfdd 370e41d
Author: Ben Burnett <bburnett at poly.edu>
Date:   Tue Sep 10 10:57:43 2013 -0400

    Merge branch 'master' into 54-2-workflow-construction
    
    Conflicts:
    	web/apps/archive/archive.js

 modules/mongo.py                  |    2 +-
 web/lib/geo/archiveLayerSource.js |   47 +++++++++++++++++++++++++++++++++---
 web/lib/geo/featureLayer.js       |    2 +-
 web/lib/geoweb.min.js             |   31 ------------------------
 web/lib/vgl/utils.js              |   26 ++++++++++++++------
 5 files changed, 63 insertions(+), 45 deletions(-)

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

Summary of changes:
 modules/mongo.py                  |    2 +-
 web/lib/geo/archiveLayerSource.js |   47 +++++++++++++++++++++++++++++++++---
 web/lib/geo/featureLayer.js       |    2 +-
 web/lib/geoweb.min.js             |   31 ------------------------
 web/lib/vgl/utils.js              |   26 ++++++++++++++------
 5 files changed, 63 insertions(+), 45 deletions(-)
 delete mode 100644 web/lib/geoweb.min.js


hooks/post-receive
-- 
OpenGeoscience