[Opengeoscience-developers] OpenGeoscience branch, next, updated. 12c39efbd08caab27d44f41a58d5cbe8eedf734d

[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  12c39efbd08caab27d44f41a58d5cbe8eedf734d (commit)
       via  5c5db1cacd2d2c46d8fdc19f7ffbf50fe898bf63 (commit)
       via  ee52bd1ec37a5e113568dafebda55c38f9e01c25 (commit)
       via  67e883a14884c4ba17a0eee2960da321b7bedbc0 (commit)
       via  80ffe6b2251fc9763dcf9615c0a553daba27c914 (commit)
       via  579587e7e1ae6df4dbbbb48545d2bfa18be2305f (commit)
      from  20c0462d8dff15ab6d402cfd47baa82b2af2f81e (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/opengeoscience.git;a=commitdiff;h=12c39efbd08caab27d44f41a58d5cbe8eedf734d
commit 12c39efbd08caab27d44f41a58d5cbe8eedf734d
Merge: 20c0462 5c5db1c
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Thu Mar 14 20:51:24 2013 -0400

    Merge remote-tracking branch 'origin/use_jsduck' into next
    
    Conflicts:
    	server.conf.in

 CMakeLists.txt            |   63 ++++++++++++++++----------------------------
 cmake/FindJSDoc.cmake     |   37 --------------------------
 cmake/FindJSDuck.cmake    |   37 ++++++++++++++++++++++++++
 configure_server.cmake.in |    9 ++++++
 server.conf.in            |    4 +-
 5 files changed, 71 insertions(+), 79 deletions(-)

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

Summary of changes:
 CMakeLists.txt            |   63 ++++++++++++++++----------------------------
 cmake/FindJSDoc.cmake     |   37 --------------------------
 cmake/FindJSDuck.cmake    |   37 ++++++++++++++++++++++++++
 configure_server.cmake.in |    9 ++++++
 server.conf.in            |    4 +-
 5 files changed, 71 insertions(+), 79 deletions(-)
 delete mode 100644 cmake/FindJSDoc.cmake
 create mode 100644 cmake/FindJSDuck.cmake
 create mode 100644 configure_server.cmake.in


hooks/post-receive
-- 
OpenGeoscience