Blender Git Loki

Git Commits -> Revision 17cbaf5

Revision 17cbaf5 by Julian Eisel (HMD_viewport)
September 8, 2016, 11:30 (GMT)
Merge branch 'master' into HMD_viewport

Conflicts:
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_System.h
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt

Commit Details:

Full Hash: 17cbaf5d164856eebcce5b21e07a1f3b5ef4086b
Parent Commits: 2ccdd0b, 45f833c

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021