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

[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  bf669a84d2418063a3e696ef908d9ff6dc1e52e5 (commit)
       via  2870756fdb7af06850717bfac81051f50c85beac (commit)
       via  5ea789e3af2084c7a6f45230297d9c1b5ff511e0 (commit)
       via  aa1f0ec9b0cf61cbb6f9579e96111cf52e04d4ca (commit)
       via  c2f5c770c894afce70489699bc133a7896bca717 (commit)
       via  d617f5c39917ef306d49611cc354c853d087649b (commit)
       via  cd03c8a19224887a34dcb29c58802900f6c92955 (commit)
       via  6961ec40d5efdae24458ef17d0592960a3efb7d8 (commit)
      from  584b285e8c01d706190bbe0d5931b61f1b67f0f6 (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=bf669a84d2418063a3e696ef908d9ff6dc1e52e5
commit bf669a84d2418063a3e696ef908d9ff6dc1e52e5
Merge: 584b285 2870756
Author: Ben Burnett <bburnett at poly.edu>
Date:   Tue Aug 13 13:02:10 2013 -0400

    Merge branch 'master' into 54-2-workflow-construction
    
    Conflicts:
    	.gitignore
    	CMakeLists.txt

 .gitignore                       |   22 ++++-
 CMakeLists.txt                   |  216 +++++++++++++-------------------------
 geoweb.min.js.in                 |   31 ++++++
 scripts/mongoDeleteCollection.py |   27 +++++
 4 files changed, 149 insertions(+), 147 deletions(-)

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

Summary of changes:
 .gitignore                       |   22 ++++-
 CMakeLists.txt                   |  216 +++++++++++++-------------------------
 geoweb.min.js.in                 |   31 ++++++
 scripts/mongoDeleteCollection.py |   27 +++++
 4 files changed, 149 insertions(+), 147 deletions(-)
 create mode 100644 geoweb.min.js.in
 create mode 100755 scripts/mongoDeleteCollection.py


hooks/post-receive
-- 
OpenGeoscience