[irrlicht] branch master updated (a818100 -> 86b28b1)

Vincent Cheng vcheng at moszumanska.debian.org
Thu Sep 10 19:23:23 UTC 2015


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

vcheng pushed a change to branch master
in repository irrlicht.

      from  a818100   fix line endings again to make quilt happy..are you happy now quilt?
       new  af3fe37   Imported Upstream version 1.8.2+dfsg1
       new  86b28b1   Merge tag 'upstream/1.8.2+dfsg1'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 changes.txt                                        |   25 +
 examples/01.HelloWorld/HelloWorld.cbp              |   12 +-
 examples/01.HelloWorld/HelloWorld_vc10.vcxproj     |    2 +
 examples/01.HelloWorld/HelloWorld_vc11.vcxproj     |    8 +-
 ...oWorld_vc10.vcxproj => HelloWorld_vc12.vcxproj} |    6 +-
 examples/02.Quake3Map/Quake3Map.cbp                |   12 +-
 examples/02.Quake3Map/Quake3Map_vc10.vcxproj       |    4 +
 examples/02.Quake3Map/Quake3Map_vc11.vcxproj       |    8 +-
 ...ake3Map_vc10.vcxproj => Quake3Map_vc12.vcxproj} |    6 +-
 examples/03.CustomSceneNode/CustomSceneNode.cbp    |   14 +-
 .../CustomSceneNode_vc10.vcxproj                   |    4 +
 .../CustomSceneNode_vc11.vcxproj                   |    8 +-
 ...e_vc10.vcxproj => CustomSceneNode_vc12.vcxproj} |    6 +-
 examples/04.Movement/Movement.cbp                  |   12 +-
 examples/04.Movement/Movement_vc10.vcxproj         |    4 +
 examples/04.Movement/Movement_vc11.vcxproj         |    8 +-
 ...Movement_vc10.vcxproj => Movement_vc12.vcxproj} |    6 +-
 examples/05.UserInterface/UserInterface.cbp        |   12 +-
 .../05.UserInterface/UserInterface_vc10.vcxproj    |    4 +
 .../05.UserInterface/UserInterface_vc11.vcxproj    |    8 +-
 ...ace_vc10.vcxproj => UserInterface_vc12.vcxproj} |    6 +-
 examples/06.2DGraphics/2DGraphics.cbp              |   12 +-
 examples/06.2DGraphics/2DGraphics_vc10.vcxproj     |    4 +
 examples/06.2DGraphics/2DGraphics_vc11.vcxproj     |    8 +-
 ...aphics_vc10.vcxproj => 2DGraphics_vc12.vcxproj} |    6 +-
 examples/07.Collision/Collision.cbp                |   12 +-
 examples/07.Collision/Collision_vc10.vcxproj       |    4 +
 examples/07.Collision/Collision_vc11.vcxproj       |    8 +-
 ...llision_vc10.vcxproj => Collision_vc12.vcxproj} |    6 +-
 examples/08.SpecialFX/SpecialFX.cbp                |   12 +-
 examples/08.SpecialFX/SpecialFX_vc10.vcxproj       |    4 +
 examples/08.SpecialFX/SpecialFX_vc11.vcxproj       |    8 +-
 ...ecialFX_vc10.vcxproj => SpecialFX_vc12.vcxproj} |    6 +-
 examples/09.Meshviewer/Meshviewer.cbp              |   12 +-
 examples/09.Meshviewer/Meshviewer_vc10.vcxproj     |    4 +
 examples/09.Meshviewer/Meshviewer_vc11.vcxproj     |    8 +-
 ...viewer_vc10.vcxproj => Meshviewer_vc12.vcxproj} |    6 +-
 examples/10.Shaders/Shaders.cbp                    |   12 +-
 examples/10.Shaders/Shaders_vc10.vcxproj           |    4 +
 examples/10.Shaders/Shaders_vc11.vcxproj           |    8 +-
 .../{Shaders_vc10.vcxproj => Shaders_vc12.vcxproj} |    6 +-
 examples/11.PerPixelLighting/PerPixelLighting.cbp  |   12 +-
 .../PerPixelLighting_vc10.vcxproj                  |    4 +
 .../PerPixelLighting_vc11.vcxproj                  |    8 +-
 ..._vc10.vcxproj => PerPixelLighting_vc12.vcxproj} |    6 +-
 examples/12.TerrainRendering/TerrainRendering.cbp  |   12 +-
 .../TerrainRendering_vc10.vcxproj                  |    4 +
 .../TerrainRendering_vc11.vcxproj                  |    8 +-
 ..._vc10.vcxproj => TerrainRendering_vc12.vcxproj} |    6 +-
 examples/13.RenderToTexture/RenderToTexture.cbp    |   12 +-
 .../RenderToTexture_vc10.vcxproj                   |    4 +
 .../RenderToTexture_vc11.vcxproj                   |    8 +-
 ...e_vc10.vcxproj => RenderToTexture_vc12.vcxproj} |    6 +-
 examples/14.Win32Window/Win32Window_vc10.vcxproj   |    4 +
 examples/14.Win32Window/Win32Window_vc11.vcxproj   |    8 +-
 ...indow_vc10.vcxproj => Win32Window_vc12.vcxproj} |    6 +-
 examples/15.LoadIrrFile/LoadIrrFile.cbp            |   12 +-
 examples/15.LoadIrrFile/LoadIrrFile_vc10.vcxproj   |    4 +
 examples/15.LoadIrrFile/LoadIrrFile_vc11.vcxproj   |    8 +-
 ...rFile_vc10.vcxproj => LoadIrrFile_vc12.vcxproj} |    6 +-
 examples/16.Quake3MapShader/Quake3MapShader.cbp    |   14 +-
 .../Quake3MapShader_vc10.vcxproj                   |    4 +
 .../Quake3MapShader_vc11.vcxproj                   |    8 +-
 ...r_vc10.vcxproj => Quake3MapShader_vc12.vcxproj} |    6 +-
 ...elloWorld for Windows Mobile on PC_vc10.vcxproj |    4 +
 ...elloWorld for Windows Mobile on PC_vc11.vcxproj |    8 +-
 ...lloWorld for Windows Mobile on PC_vc12.vcxproj} |   10 +-
 examples/18.SplitScreen/SplitScreen.cbp            |   12 +-
 examples/18.SplitScreen/SplitScreen_vc10.vcxproj   |    4 +
 examples/18.SplitScreen/SplitScreen_vc11.vcxproj   |    8 +-
 ...creen_vc10.vcxproj => SplitScreen_vc12.vcxproj} |    6 +-
 examples/19.MouseAndJoystick/MouseAndJoystick.cbp  |   12 +-
 .../MouseAndJoystick_vc10.vcxproj                  |    4 +
 .../MouseAndJoystick_vc11.vcxproj                  |    8 +-
 ..._vc10.vcxproj => MouseAndJoystick_vc12.vcxproj} |    6 +-
 examples/20.ManagedLights/ManagedLights.cbp        |   12 +-
 .../20.ManagedLights/ManagedLights_vc10.vcxproj    |    4 +
 .../20.ManagedLights/ManagedLights_vc11.vcxproj    |    8 +-
 ...hts_vc10.vcxproj => ManagedLights_vc12.vcxproj} |    6 +-
 examples/21.Quake3Explorer/Quake3Explorer.cbp      |   12 +-
 .../21.Quake3Explorer/Quake3Explorer_vc10.vcxproj  |    4 +
 .../21.Quake3Explorer/Quake3Explorer_vc11.vcxproj  |    8 +-
 ...er_vc10.vcxproj => Quake3Explorer_vc12.vcxproj} |    6 +-
 examples/22.MaterialViewer/MaterialViewer.cbp      |   12 +-
 .../22.MaterialViewer/MaterialViewer_vc10.vcxproj  |    4 +
 .../22.MaterialViewer/MaterialViewer_vc11.vcxproj  |    8 +-
 ...er_vc10.vcxproj => MaterialViewer_vc12.vcxproj} |    6 +-
 examples/22.MaterialViewer/main.cpp                |    4 +-
 examples/23.SMeshHandling/SMeshHandling.cbp        |   12 +-
 .../23.SMeshHandling/SMeshHandling_vc10.vcxproj    |    4 +
 .../23.SMeshHandling/SMeshHandling_vc11.vcxproj    |    8 +-
 ...ing_vc10.vcxproj => SMeshHandling_vc12.vcxproj} |    6 +-
 examples/24.CursorControl/CursorControl.cbp        |   13 +-
 .../24.CursorControl/CursorControl_vc10.vcxproj    |    4 +
 .../24.CursorControl/CursorControl_vc11.vcxproj    |    8 +-
 ...rol_vc10.vcxproj => CursorControl_vc12.vcxproj} |    6 +-
 examples/25.XmlHandling/XmlHandling.cbp            |   12 +-
 examples/25.XmlHandling/XmlHandling_vc10.vcxproj   |    4 +
 examples/25.XmlHandling/XmlHandling_vc11.vcxproj   |    8 +-
 ...dling_vc10.vcxproj => XmlHandling_vc12.vcxproj} |    6 +-
 examples/26.OcclusionQuery/OcclusionQuery.cbp      |   12 +-
 .../26.OcclusionQuery/OcclusionQuery_vc10.vcxproj  |    4 +
 .../26.OcclusionQuery/OcclusionQuery_vc11.vcxproj  |    8 +-
 ...ry_vc10.vcxproj => OcclusionQuery_vc12.vcxproj} |    6 +-
 ...Examples_vc11.sln => BuildAllExamples_vc12.sln} |   91 +-
 examples/Demo/CDemo.cpp                            |    4 +-
 examples/Demo/Demo_vc10.vcxproj                    |    8 +-
 examples/Demo/Demo_vc11.vcxproj                    |    8 +-
 .../Demo/{Demo_vc10.vcxproj => Demo_vc12.vcxproj}  |    8 +-
 examples/Demo/demo.cbp                             |   14 +-
 include/IGUISkin.h                                 |    2 +-
 include/IrrCompileConfig.h                         |    4 +-
 include/irrpack.h                                  |    2 +-
 readme.txt                                         |    2 +-
 scripts/doc/irrlicht/doxygen-pdf.cfg               | 1644 +++++++++++++-------
 scripts/doc/irrlicht/doxygen.cfg                   | 1642 ++++++++++++-------
 scripts/doc/irrlicht/doxygen.css                   |  314 ----
 scripts/doc/irrlicht/footer.html                   |   31 +-
 scripts/doc/irrlicht/header.html                   |   19 -
 scripts/doc/irrlicht/irrlichtlogo.png              |  Bin 0 -> 12792 bytes
 scripts/doc/irrlicht/makedocumentation.bat         |    8 +
 scripts/libIrrlicht1.spec                          |    4 +-
 scripts/packages/OSX/Irrlicht.pmdoc/index.xml      |    4 +-
 source/Irrlicht/CB3DMeshFileLoader.cpp             |    3 +
 source/Irrlicht/CGUIEditBox.cpp                    |   17 +-
 source/Irrlicht/CGUIListBox.cpp                    |    6 +-
 source/Irrlicht/CGUIStaticText.cpp                 |   16 +-
 source/Irrlicht/CImageLoaderJPG.cpp                |    2 +
 source/Irrlicht/CImageLoaderPNG.cpp                |    2 +-
 source/Irrlicht/CIrrDeviceLinux.cpp                |   15 +-
 source/Irrlicht/CNullDriver.cpp                    |    4 +-
 source/Irrlicht/COBJMeshFileLoader.cpp             |   20 +-
 source/Irrlicht/COpenGLDriver.cpp                  |   13 +-
 source/Irrlicht/CXMeshFileLoader.cpp               |    1 +
 source/Irrlicht/Irrlicht-gcc.cbp                   |  710 ++++-----
 source/Irrlicht/Irrlicht10.0.vcxproj               |    7 +
 source/Irrlicht/Irrlicht11.0.vcxproj               |   14 +-
 .../{Irrlicht10.0.vcxproj => Irrlicht12.0.vcxproj} |    9 +-
 ...cxproj.filters => Irrlicht12.0.vcxproj.filters} |    0
 source/Irrlicht/Makefile                           |    4 +-
 tools/GUIEditor/CGUIEditWorkspace.cpp              |   11 +-
 tools/GUIEditor/GUI Editor_vc10.vcxproj            |    4 +
 tools/GUIEditor/GUI Editor_vc11.vcxproj            |    8 +-
 ...Editor_vc10.vcxproj => GUI Editor_vc12.vcxproj} |    6 +-
 tools/GUIEditor/GUIEditor_gcc.cbp                  |   11 +-
 tools/IrrFontTool/newFontTool/Makefile             |    2 +-
 .../newFontTool/irrFontTool_vc10.vcxproj           |    4 +
 .../newFontTool/irrFontTool_vc11.vcxproj           |    8 +-
 ...tTool_vc10.vcxproj => irrFontTool_vc12.vcxproj} |    6 +-
 tools/MeshConverter/MeshConverter.cbp              |   11 +-
 tools/MeshConverter/MeshConverter_vc10.vcxproj     |    4 +
 tools/MeshConverter/MeshConverter_vc11.vcxproj     |    8 +-
 ...ter_vc10.vcxproj => MeshConverter_vc12.vcxproj} |    6 +-
 153 files changed, 3301 insertions(+), 2232 deletions(-)
 copy examples/01.HelloWorld/{HelloWorld_vc10.vcxproj => HelloWorld_vc12.vcxproj} (95%)
 copy examples/02.Quake3Map/{Quake3Map_vc10.vcxproj => Quake3Map_vc12.vcxproj} (95%)
 copy examples/03.CustomSceneNode/{CustomSceneNode_vc10.vcxproj => CustomSceneNode_vc12.vcxproj} (96%)
 copy examples/04.Movement/{Movement_vc10.vcxproj => Movement_vc12.vcxproj} (95%)
 copy examples/05.UserInterface/{UserInterface_vc10.vcxproj => UserInterface_vc12.vcxproj} (95%)
 copy examples/06.2DGraphics/{2DGraphics_vc10.vcxproj => 2DGraphics_vc12.vcxproj} (95%)
 copy examples/07.Collision/{Collision_vc10.vcxproj => Collision_vc12.vcxproj} (95%)
 copy examples/08.SpecialFX/{SpecialFX_vc10.vcxproj => SpecialFX_vc12.vcxproj} (95%)
 copy examples/09.Meshviewer/{Meshviewer_vc10.vcxproj => Meshviewer_vc12.vcxproj} (95%)
 copy examples/10.Shaders/{Shaders_vc10.vcxproj => Shaders_vc12.vcxproj} (95%)
 copy examples/11.PerPixelLighting/{PerPixelLighting_vc10.vcxproj => PerPixelLighting_vc12.vcxproj} (95%)
 copy examples/12.TerrainRendering/{TerrainRendering_vc10.vcxproj => TerrainRendering_vc12.vcxproj} (95%)
 copy examples/13.RenderToTexture/{RenderToTexture_vc10.vcxproj => RenderToTexture_vc12.vcxproj} (95%)
 copy examples/14.Win32Window/{Win32Window_vc10.vcxproj => Win32Window_vc12.vcxproj} (95%)
 copy examples/15.LoadIrrFile/{LoadIrrFile_vc10.vcxproj => LoadIrrFile_vc12.vcxproj} (95%)
 copy examples/16.Quake3MapShader/{Quake3MapShader_vc10.vcxproj => Quake3MapShader_vc12.vcxproj} (95%)
 copy examples/17.HelloWorld_Mobile/{17. HelloWorld for Windows Mobile on PC_vc11.vcxproj => 17. HelloWorld for Windows Mobile on PC_vc12.vcxproj} (95%)
 copy examples/18.SplitScreen/{SplitScreen_vc10.vcxproj => SplitScreen_vc12.vcxproj} (95%)
 copy examples/19.MouseAndJoystick/{MouseAndJoystick_vc10.vcxproj => MouseAndJoystick_vc12.vcxproj} (95%)
 copy examples/20.ManagedLights/{ManagedLights_vc10.vcxproj => ManagedLights_vc12.vcxproj} (96%)
 copy examples/21.Quake3Explorer/{Quake3Explorer_vc10.vcxproj => Quake3Explorer_vc12.vcxproj} (95%)
 copy examples/22.MaterialViewer/{MaterialViewer_vc10.vcxproj => MaterialViewer_vc12.vcxproj} (95%)
 copy examples/23.SMeshHandling/{SMeshHandling_vc10.vcxproj => SMeshHandling_vc12.vcxproj} (95%)
 copy examples/24.CursorControl/{CursorControl_vc10.vcxproj => CursorControl_vc12.vcxproj} (95%)
 copy examples/25.XmlHandling/{XmlHandling_vc10.vcxproj => XmlHandling_vc12.vcxproj} (95%)
 copy examples/26.OcclusionQuery/{OcclusionQuery_vc10.vcxproj => OcclusionQuery_vc12.vcxproj} (95%)
 copy examples/{BuildAllExamples_vc11.sln => BuildAllExamples_vc12.sln} (90%)
 copy examples/Demo/{Demo_vc10.vcxproj => Demo_vc12.vcxproj} (96%)
 delete mode 100644 scripts/doc/irrlicht/doxygen.css
 delete mode 100644 scripts/doc/irrlicht/header.html
 create mode 100644 scripts/doc/irrlicht/irrlichtlogo.png
 copy source/Irrlicht/{Irrlicht10.0.vcxproj => Irrlicht12.0.vcxproj} (97%)
 copy source/Irrlicht/{Irrlicht10.0.vcxproj.filters => Irrlicht12.0.vcxproj.filters} (100%)
 copy tools/GUIEditor/{GUI Editor_vc10.vcxproj => GUI Editor_vc12.vcxproj} (95%)
 copy tools/IrrFontTool/newFontTool/{irrFontTool_vc10.vcxproj => irrFontTool_vc12.vcxproj} (95%)
 copy tools/MeshConverter/{MeshConverter_vc10.vcxproj => MeshConverter_vc12.vcxproj} (95%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/irrlicht.git



More information about the Pkg-games-commits mailing list