[Opengeoscience-developers] OpenGeoscience branch, master, updated. 3a48831b8e9eb9ef443443046fe7de3b930ca60b
Aashish Chaudhary
aashish.chaudhary at kitware.com
Fri May 10 08:55:33 EDT 2013
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 3a48831b8e9eb9ef443443046fe7de3b930ca60b (commit)
via c2ce2999ef0ebbf857c15e0704ee5df2a4903826 (commit)
via f6491b80653efe8b3d878716643c807e7fdae185 (commit)
via 4065fde38f23d105ad4076c3f4a55293c4a051f1 (commit)
via 726f1812a95197c126d627eeeaa433c6e47c2cdd (commit)
via cad2e29028f9e5635e59e2d89bed0a90630d2b30 (commit)
via d9c18472e936334549d03395fde04393dd2b8c52 (commit)
via 4f68cc57acc3f26982a0c7ceec5e822d467952f6 (commit)
from 6c6e2758f8edf9ddccae026f30bb7127239ec0df (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=3a48831b8e9eb9ef443443046fe7de3b930ca60b
commit 3a48831b8e9eb9ef443443046fe7de3b930ca60b
Merge: 6c6e275 c2ce299
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Fri May 10 08:50:06 2013 -0400
Merge remote-tracking branch 'origin/ui-jslint-fixed'
* origin/ui-jslint-fixed:
gis.js update @line #245
UI/gis.js pranthesis removed
UI folder update issue with a funcion parameter on line 333
clean update of UI folder from Master and Geo from master
ui/gis.js Unable to rectify-> Do not make functions within a loop
UI updated
Conflicts:
web/lib/ui/gis.js
web/lib/ui/gis.js | 328 ++++++++++++++++++++++++++++-----------------------
web/lib/ui/init.js | 1 +
2 files changed, 181 insertions(+), 148 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
web/lib/ui/gis.js | 328 ++++++++++++++++++++++++++++-----------------------
web/lib/ui/init.js | 1 +
2 files changed, 181 insertions(+), 148 deletions(-)
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list