[Opengeoscience-developers] OpenGeoscience branch, master, updated. 5ea789e3af2084c7a6f45230297d9c1b5ff511e0

[Aashish Chaudhary]

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, master has been updated
       via  5ea789e3af2084c7a6f45230297d9c1b5ff511e0 (commit)
       via  c2f5c770c894afce70489699bc133a7896bca717 (commit)
       via  d617f5c39917ef306d49611cc354c853d087649b (commit)
       via  cd03c8a19224887a34dcb29c58802900f6c92955 (commit)
      from  aa1f0ec9b0cf61cbb6f9579e96111cf52e04d4ca (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=5ea789e3af2084c7a6f45230297d9c1b5ff511e0
commit 5ea789e3af2084c7a6f45230297d9c1b5ff511e0
Merge: aa1f0ec c2f5c77
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Mon Aug 12 15:23:51 2013 -0400

    Merge remote-tracking branch 'origin/88-enhance-run-from-source-config'
    
    * origin/88-enhance-run-from-source-config:
      Adds missing file
      ignore src geoweb.min.js since its auto-generated
      Combines source file lists into one #88
    
    Conflicts:
    	web/lib/geoweb.min.js

 .gitignore       |    5 +-
 CMakeLists.txt   |  194 ++++++++++++++++++++----------------------------------
 geoweb.min.js.in |   31 +++++++++
 3 files changed, 107 insertions(+), 123 deletions(-)

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

Summary of changes:
 .gitignore       |    5 +-
 CMakeLists.txt   |  194 ++++++++++++++++++++----------------------------------
 geoweb.min.js.in |   31 +++++++++
 3 files changed, 107 insertions(+), 123 deletions(-)
 create mode 100644 geoweb.min.js.in


hooks/post-receive
-- 
OpenGeoscience