[Opengeoscience-developers] OpenGeoscience branch, next, updated. c9b0085245a2a2dadafa133b1241690c6da49f4b
Aashish Chaudhary
aashish.chaudhary at kitware.com
Fri May 3 21:25:00 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, next has been updated
via c9b0085245a2a2dadafa133b1241690c6da49f4b (commit)
via c11327da5c52a9bf2ed35deb86dab2bef1c9e310 (commit)
via 26816b920aa4dc5735aa8be2dde2d666abe4a085 (commit)
via 29c150707f37edf56b87aebedf8a2710bc76c8ca (commit)
from 6528097f89663263a6d999cd791fdb809d559de7 (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=c9b0085245a2a2dadafa133b1241690c6da49f4b
commit c9b0085245a2a2dadafa133b1241690c6da49f4b
Merge: 6528097 c11327d
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Fri May 3 21:24:47 2013 -0400
Merge remote-tracking branch 'origin/bug4_implement_picking' into next
* origin/bug4_implement_picking:
Style and eqeq fixes
Re-added methods to get width and height of the renderer
Added picker
Conflicts:
web/lib/vgl/picker.js
web/lib/vgl/renderer.js
CMakeLists.txt | 2 ++
web/lib/vgl/picker.js | 18 +++++++++---------
web/lib/vgl/renderer.js | 26 +++++++++++++++++++++-----
3 files changed, 32 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 ++
web/lib/vgl/picker.js | 18 +++++++++---------
web/lib/vgl/renderer.js | 26 +++++++++++++++++++++-----
3 files changed, 32 insertions(+), 14 deletions(-)
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list