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

[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  03ba682c08324950e260593cab2a283076e55291 (commit)
       via  ace32326f8746a21c4d94387679af1234d9601c1 (commit)
       via  a24e7763ae7ecf0feef823cc7cba872157b96623 (commit)
       via  a6f8b266ec56b7cca1c4e583004d1b591fa7a789 (commit)
       via  09ebc7d5620b40aac23f576f2f096801de8c1092 (commit)
       via  68bcbb84228fe0f97d28bf913e7bf3e8e695a020 (commit)
       via  ea71a2253522e388d971f07388dd743e88dd0a3e (commit)
       via  b1c2f34c8709be0a8db56eba1cafea51d399315c (commit)
       via  2ef01f858f011b4d6fa68a0c8d5109f8c745de8b (commit)
       via  10f11d04769c17379b2c1e2130d587d7467dbcc4 (commit)
       via  e8220855d1c72030d4f4e4c67a3355151830cc68 (commit)
      from  8dd544ccfa8a6bf9dca6dabe6918b50f569b6a6a (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=03ba682c08324950e260593cab2a283076e55291
commit 03ba682c08324950e260593cab2a283076e55291
Merge: 8dd544c ace3232
Author: Ben Burnett <bburnett at poly.edu>
Date:   Wed Jul 31 16:34:37 2013 -0400

    Merge branch 'master' into 54-2-workflow-construction
    
    Conflicts:
    	web/common/js/proj4.js
    	web/common/js/proj4.min.js
    	web/lib/wfl/workflowUtils.js

 CMakeLists.txt                       |    8 --------
 {scripts => modules}/standardtime.py |    0
 scripts/mongoimp.py                  |    6 ++++++
 web/common/js/d3.v3.min.js           |    2 +-
 web/common/js/defs/EPSG42304.js      |    2 +-
 web/common/js/proj4.js               |    2 +-
 web/common/js/proj4.min.js           |    2 +-
 web/lib/geoweb.min.js                |    1 +
 web/lib/wfl/workflowUtils.js         |   11 ++++++-----
 9 files changed, 17 insertions(+), 17 deletions(-)

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

Summary of changes:
 CMakeLists.txt                       |    8 --------
 {scripts => modules}/standardtime.py |    0
 scripts/mongoimp.py                  |    6 ++++++
 web/common/js/d3.v3.min.js           |    2 +-
 web/common/js/defs/EPSG42304.js      |    2 +-
 web/common/js/proj4.js               |    2 +-
 web/common/js/proj4.min.js           |    2 +-
 web/lib/geoweb.min.js                |    1 +
 web/lib/wfl/workflowUtils.js         |   11 ++++++-----
 9 files changed, 17 insertions(+), 17 deletions(-)
 rename {scripts => modules}/standardtime.py (100%)


hooks/post-receive
-- 
OpenGeoscience