[Opengeoscience-developers] OpenGeoscience branch, next, updated. bd593ac16512fcb4253e2d7e7209a0dfa783b2f4

[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  bd593ac16512fcb4253e2d7e7209a0dfa783b2f4 (commit)
       via  d617f5c39917ef306d49611cc354c853d087649b (commit)
       via  b727c7491d8ef97ea17f24bd1c6bae5762de8ded (commit)
       via  cd03c8a19224887a34dcb29c58802900f6c92955 (commit)
      from  b893cdff94fb5ea56b1b9cb316983729c38ccbe6 (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=bd593ac16512fcb4253e2d7e7209a0dfa783b2f4
commit bd593ac16512fcb4253e2d7e7209a0dfa783b2f4
Merge: b727c74 d617f5c
Author: Ben Burnett <bburnett at poly.edu>
Date:   Thu Aug 8 19:30:59 2013 -0400

    Merge branch '88-enhance-run-from-source-config' into next

 .gitignore |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=b727c7491d8ef97ea17f24bd1c6bae5762de8ded
commit b727c7491d8ef97ea17f24bd1c6bae5762de8ded
Merge: b893cdf cd03c8a
Author: Ben Burnett <bburnett at poly.edu>
Date:   Thu Aug 8 19:28:42 2013 -0400

    Merge branch '88-enhance-run-from-source-config' into next
    
    Conflicts:
    	web/lib/geoweb.min.js

 CMakeLists.txt        |  194 ++++++++++++++++++-------------------------------
 web/lib/geoweb.min.js |   90 -----------------------
 2 files changed, 72 insertions(+), 212 deletions(-)

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

Summary of changes:
 .gitignore            |    5 +-
 CMakeLists.txt        |  194 ++++++++++++++++++-------------------------------
 web/lib/geoweb.min.js |   90 -----------------------
 3 files changed, 76 insertions(+), 213 deletions(-)
 delete mode 100644 web/lib/geoweb.min.js


hooks/post-receive
-- 
OpenGeoscience