[Opengeoscience-developers] OpenGeoscience branch, 131-workflow-cleanup, updated. c95520ea614c360db8b978c4babf6a8010095d88

[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, 131-workflow-cleanup has been updated
       via  c95520ea614c360db8b978c4babf6a8010095d88 (commit)
       via  d0094e624d9763ec2300215c7cd59b28b99e34eb (commit)
       via  e2968666bb9c8e8711589f38a61b58875eb1d57f (commit)
       via  6cca7fe4f14f0a0e5edaa7a42d8db20bb113b70c (commit)
       via  98bf3b2e1f5c6c8ea29d02f9096d6d6a62ed2b1e (commit)
       via  b1d2b1bfd84c36449c5273d6a93a0dbbbc2a79b1 (commit)
       via  10331b2af3c5d63e0e83bed4223497c479ffdc2e (commit)
       via  576cf4d1c1acc43b1038330dd374c5bbb1b5d8a8 (commit)
       via  c7f36768b1ca394a6bb60a4b4eac6036a3c34c66 (commit)
       via  a8aea25240ca4a33505b5f00003c7eb631b32871 (commit)
       via  89458d5aa8c2f1b319b9ca86550c7901cc8c16fd (commit)
       via  656b03a1aa9456c125e8208dc4c92f33bebb5150 (commit)
       via  c7e7bded59eb110210ca47c9d8f230a2cacc2467 (commit)
       via  9246e5bf53138af76eecee052c6ae36ed7b7b366 (commit)
       via  cd3295cfb50327d18a02ae7d4ce0bd48acd4bbea (commit)
       via  882007d1fa1b6b0ee02b93305ea546cbefb4cf9f (commit)
       via  7be65c2e1399b4dad49080db683d4d21f5b4016b (commit)
       via  7c09a7f72a3cd7f959791453fc1452205f9be47c (commit)
       via  5b923b15d054febad6f7aa192dcf83c8a56a40ed (commit)
       via  7c6e024654a9de9b3f601ec111c2d67bd9a682eb (commit)
       via  d027d1f2844d1dc78f98ee367d78833368f1bca8 (commit)
       via  6e0754b0989640a1f2977cbcab3c0278df55662d (commit)
       via  3a58e910a8605adcc89a5ea1a801c59c78a5b607 (commit)
       via  45fcb93db6213fa3457bb77103ec765b5d354d1e (commit)
       via  9812ca010bb75d4a83c9d735ea0b0bce1f17b9e1 (commit)
       via  dd6f1e1f620a3b3e5fe979b04b309aa9ec03b535 (commit)
       via  a123247cd85a8bd2ff56c3e4a7eecb87c5804197 (commit)
       via  a509164755b16678cb0a634b6a2fc951b282854e (commit)
       via  896a333e2b75fec782a1b53d376a470f685694ac (commit)
       via  64b84ce43fc17eb5f433cd28d8f0ee2c69ae4a6e (commit)
       via  6f24123623d3f823a6b53df67da037e4ce6bff68 (commit)
       via  aaa85fabd6c717b33a7b637278f05cb9846eade2 (commit)
       via  91d84472071bc60fcefa27e7cd799bde4d2c3d1d (commit)
       via  40dbc5d1703b66751c23371dfa430173bfcc1131 (commit)
       via  8da741f2d3007404b93b04239324900d2f5ceae2 (commit)
      from  c1dc85f15611143ce9017eca1f9298fe6ba77000 (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=c95520ea614c360db8b978c4babf6a8010095d88
commit c95520ea614c360db8b978c4babf6a8010095d88
Merge: c1dc85f d0094e6
Author: Ben Burnett <benbu at nyu.edu>
Date:   Thu Sep 12 11:40:57 2013 -0400

    Merge branch 'master' into 131-workflow-cleanup

 CMakeLists.txt                                     |  236 +++++++++++++-------
 cmake/FindVisTrails.cmake                          |   12 +
 cmake/configure.cmake                              |   29 +++
 cmake/configure_server.cmake.in                    |   18 ++
 cmake/dashboards/vishnu.cmake                      |    2 +
 geocelery_conf.py.in => cmake/geocelery_conf.py.in |    0
 geoweb.min.js.in => cmake/geoweb.min.js.in         |    0
 geoweb_dev.in => cmake/geoweb_dev.in               |    0
 cmake/run.sh.in                                    |   10 +
 server.conf.in => cmake/server.conf.in             |    0
 cmake/setup-runtime.sh.in                          |    5 +
 configure_server.cmake.in                          |   12 -
 scripts/setup_path.sh                              |    5 -
 .../trim_trailing_whitespace.sh                    |    0
 web/apps/archive/archive.js                        |   52 +++--
 web/apps/archive/index.html                        |   30 +--
 web/lib/geo/featureLayer.js                        |   12 +-
 web/lib/geo/layer.js                               |    8 -
 web/lib/geo/map.js                                 |   16 +-
 web/lib/geo/openStreetMapLayer.js                  |    4 +-
 web/lib/ui/gis.js                                  |   10 +-
 21 files changed, 290 insertions(+), 171 deletions(-)

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

Summary of changes:
 CMakeLists.txt                                     |  236 +++++++++++++-------
 cmake/FindVisTrails.cmake                          |   12 +
 cmake/configure.cmake                              |   29 +++
 cmake/configure_server.cmake.in                    |   18 ++
 cmake/dashboards/vishnu.cmake                      |    2 +
 geocelery_conf.py.in => cmake/geocelery_conf.py.in |    0
 geoweb.min.js.in => cmake/geoweb.min.js.in         |    0
 geoweb_dev.in => cmake/geoweb_dev.in               |    0
 cmake/run.sh.in                                    |   10 +
 server.conf.in => cmake/server.conf.in             |    0
 cmake/setup-runtime.sh.in                          |    5 +
 configure_server.cmake.in                          |   12 -
 scripts/setup_path.sh                              |    5 -
 .../trim_trailing_whitespace.sh                    |    0
 web/apps/archive/archive.js                        |   52 +++--
 web/apps/archive/index.html                        |   30 +--
 web/lib/geo/featureLayer.js                        |   12 +-
 web/lib/geo/layer.js                               |    8 -
 web/lib/geo/map.js                                 |   16 +-
 web/lib/geo/openStreetMapLayer.js                  |    4 +-
 web/lib/ui/gis.js                                  |   10 +-
 21 files changed, 290 insertions(+), 171 deletions(-)
 create mode 100644 cmake/FindVisTrails.cmake
 create mode 100644 cmake/configure.cmake
 create mode 100644 cmake/configure_server.cmake.in
 rename geocelery_conf.py.in => cmake/geocelery_conf.py.in (100%)
 rename geoweb.min.js.in => cmake/geoweb.min.js.in (100%)
 rename geoweb_dev.in => cmake/geoweb_dev.in (100%)
 create mode 100755 cmake/run.sh.in
 rename server.conf.in => cmake/server.conf.in (100%)
 create mode 100755 cmake/setup-runtime.sh.in
 delete mode 100644 configure_server.cmake.in
 delete mode 100755 scripts/setup_path.sh
 rename trim_trailing_whitespace.sh => scripts/trim_trailing_whitespace.sh (100%)


hooks/post-receive
-- 
OpenGeoscience