You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tree: 68ab85de7b

apple-crashy-msaa-default-framebuffer

audio-import

catastrophic-cross

chainsaw-surgery

dpi-change-events

euler-xxx

findsdl-include-root

gltestlib-symbol-duplication

gpu-preference

inverted-ranges

ktx1-detection

master

meshdata-cereal-killer

mousecapture

multiwindow

next

sceneconverter

scenedata-optimizations

simd

vectorfields

zerocopy

snapshot-2013-08

snapshot-2013-10

snapshot-2014-01

snapshot-2014-01-compatibility

snapshot-2014-06

snapshot-2014-06-compatibility

snapshot-2015-05

snapshot-2015-05-compatibility

v2013.08

v2013.10

v2014.01

v2014.06

v2015.05

v2018.02

v2018.04

v2018.10

v2019.01

v2019.10

v2020.06

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '68ab85de7b'

${ noResults }

magnum/src

History

Vladimír Vondruš 68ab85de7b Merge branch 'master' into compatibility ... Conflicts: src/Magnum/AbstractTexture.cpp src/Magnum/BufferTexture.h src/Magnum/CubeMapTexture.h src/Magnum/CubeMapTextureArray.h src/Magnum/DebugMessage.cpp src/Magnum/Magnum.h src/Magnum/MeshTools/Duplicate.h src/Magnum/MeshTools/RemoveDuplicates.h src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp src/Magnum/SceneGraph/FeatureGroup.h src/Magnum/SceneGraph/Object.h src/Magnum/SceneGraph/Object.hpp src/Magnum/Shaders/AbstractVector.h src/Magnum/Texture.h		12 years ago
..
Magnum	Merge branch 'master' into compatibility	12 years ago
MagnumExternal	Merge branch 'master' into compatibility	12 years ago
MagnumPlugins	Merge branch 'master' into compatibility	12 years ago
CMakeLists.txt	Merge branch 'master' into compatibility	12 years ago