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

[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, next has been updated
       via  cc83f398cf04f77ba588400eb152a38adf9fc99b (commit)
       via  489b1a2a8f02714de3b813b5590366f350f51769 (commit)
       via  16e4e65460318ae7327528a91eb8e56bf56b1161 (commit)
       via  b69a2d1ab7909040dec1422b545424e356b1c826 (commit)
       via  4a528122b1279dd8808d3fdd12dbb37f93f7d0a0 (commit)
       via  852d3816cce014fef7815c67a01643e8527941b8 (commit)
       via  4a25c0222664627f756bb2653dc2a9e9c9d54d23 (commit)
      from  4e86fecbebe982b758dccb4429f4e608a49628f4 (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=cc83f398cf04f77ba588400eb152a38adf9fc99b
commit cc83f398cf04f77ba588400eb152a38adf9fc99b
Merge: 4e86fec 489b1a2
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Fri Mar 29 16:56:58 2013 -0400

    Merge remote-tracking branch 'origin/bug_15_geoweb_modules' into next
    
    * origin/bug_15_geoweb_modules:
      Updated usage info
      Updated CMakeList to reflect restructure
      Updated name of the scripts
      Moved python scripts into modules directory
    
    Conflicts:
    	CMakeLists.txt
    	cpi.py
    	modules/cpi.py
    	modules/websocket_chat.py
    	modules/websocket_pi.py
    	websocket_chat.py
    	websocket_pi.py
    	ws/chat.py
    	ws/pi.py
    	ws/workers/cpi.py

 CMakeLists.txt                 |   15 ++---
 ogsctl => geoweb               |    4 +-
 ogs.py => geoweb.py            |    2 +
 modules/cpi.py                 |   20 ++++++
 ogsvtk.py => modules/ogsvtk.py |    1 +
 modules/websocket_chat.py      |  122 +++++++++++++++++++++++++++++++++
 modules/websocket_pi.py        |  146 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 299 insertions(+), 11 deletions(-)

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

Summary of changes:
 CMakeLists.txt                          |   15 ++++++---------
 ogsctl => geoweb                        |    4 ++--
 ogs.py => geoweb.py                     |    2 ++
 {ws/workers => modules}/cpi.py          |    0
 ogsvtk.py => modules/ogsvtk.py          |    1 +
 ws/chat.py => modules/websocket_chat.py |    2 ++
 ws/pi.py => modules/websocket_pi.py     |    7 ++++---
 7 files changed, 17 insertions(+), 14 deletions(-)
 rename ogsctl => geoweb (95%)
 rename ogs.py => geoweb.py (98%)
 mode change 100644 => 100755
 copy {ws/workers => modules}/cpi.py (100%)
 rename ogsvtk.py => modules/ogsvtk.py (99%)
 mode change 100644 => 100755
 copy ws/chat.py => modules/websocket_chat.py (99%)
 mode change 100644 => 100755
 copy ws/pi.py => modules/websocket_pi.py (96%)
 mode change 100644 => 100755


hooks/post-receive
-- 
OpenGeoscience