Blender Git Loki
Git Commits -> Revision 2658c67
Revision 2658c67 by Benoit Bolsee (decklink) September 29, 2015, 09:42 (GMT) |
Merge remote-tracking branch 'origin/master' into decklink ce/blender/python/generic/bgl.c Conflicts: build_files/cmake/macros.cmake intern/atomic/atomic_ops.h intern/ghost/GHOST_ISystem.h intern/ghost/GHOST_Types.h intern/ghost/intern/GHOST_ContextGLX.cpp intern/ghost/intern/GHOST_ContextWGL.cpp intern/ghost/intern/GHOST_ContextWGL.h intern/ghost/intern/GHOST_SystemX11.cpp intern/ghost/intern/GHOST_WindowX11.cpp intern/ghost/intern/GHOST_WindowX11.h source/blenderplayer/CMakeLists.txt |
Commit Details:
Full Hash: 2658c67165138c68e01ed1b23606558cde432936
Parent Commits: 26b730b, fc97204
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021