[Opengeoscience-developers] OpenGeoscience branch, master, updated. b1d2b1bfd84c36449c5273d6a93a0dbbbc2a79b1

[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  b1d2b1bfd84c36449c5273d6a93a0dbbbc2a79b1 (commit)
       via  10331b2af3c5d63e0e83bed4223497c479ffdc2e (commit)
      from  576cf4d1c1acc43b1038330dd374c5bbb1b5d8a8 (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=b1d2b1bfd84c36449c5273d6a93a0dbbbc2a79b1
commit b1d2b1bfd84c36449c5273d6a93a0dbbbc2a79b1
Merge: 576cf4d 10331b2
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Wed Sep 11 17:46:23 2013 -0400

    Merge remote-tracking branch 'origin/fix_server_conf'
    
    * origin/fix_server_conf:
      Set staticdata dir appropriately based on the argument

 cmake/configure_server.cmake.in |    5 +++++
 cmake/server.conf.in            |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

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

Summary of changes:
 cmake/configure_server.cmake.in |    5 +++++
 cmake/server.conf.in            |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenGeoscience