[ros-rviz] 01/04: Merge tag 'upstream/1.11.10+dfsg'

[Wookey]

This is an automated email from the git hooks/post-receive script.

wookey pushed a commit to branch master
in repository ros-rviz.

commit 238094b472a993a1ec1259d5cef41efe59f2dd81
Merge: ac4ff30 4da495a
Author: Wookey <wookey at wookware.org>
Date:   Wed Jan 20 22:23:25 2016 +0000

    Merge tag 'upstream/1.11.10+dfsg'
    
    Upstream version 1.11.10+dfsg

 ogre_media/fonts/font_arial.png             |  Bin 111419 -> 0 bytes
 src/test/meshes/F10.stl                     |  Bin 806084 -> 0 bytes
 src/test/meshes/F2.stl                      |  Bin 592284 -> 0 bytes
 src/test/meshes/F3.stl                      |  Bin 141684 -> 0 bytes
 src/test/meshes/F4.stl                      |  Bin 501684 -> 0 bytes
 src/test/meshes/README                      |    3 -
 src/test/meshes/ax12_box.stl                |  Bin 1615684 -> 0 bytes
 src/test/meshes/base_color.tif              |  Bin 167036 -> 0 bytes
 src/test/meshes/base_normals.tif            |  Bin 814892 -> 0 bytes
 src/test/meshes/finger.stl                  |  Bin 33484 -> 0 bytes
 src/test/meshes/kitchen/doc.kml             |   58 -
 src/test/meshes/kitchen/images/texture0.jpg |  Bin 14871 -> 0 bytes
 src/test/meshes/kitchen/images/texture1.jpg |  Bin 248716 -> 0 bytes
 src/test/meshes/kitchen/images/texture2.jpg |  Bin 12956 -> 0 bytes
 src/test/meshes/kitchen/images/texture3.jpg |  Bin 4231 -> 0 bytes
 src/test/meshes/kitchen/images/texture4.jpg |  Bin 1591 -> 0 bytes
 src/test/meshes/kitchen/images/texture5.jpg |  Bin 12993 -> 0 bytes
 src/test/meshes/kitchen/images/texture6.jpg |  Bin 12993 -> 0 bytes
 src/test/meshes/kitchen/models/dada.dae     | 4045 ---------------------------
 src/test/meshes/kitchen/textures.txt        |    7 -
 src/test/meshes/pr2-base.dae                |  209 --
 21 files changed, 4322 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-rviz.git