projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c7cfa0
efdd8f1
)
Merge branch 'master' into blender2.8
author
Campbell Barton <ideasman42@gmail.com>
Thu, 7 Dec 2017 13:21:54 +0000
(
00:21
+1100)
committer
Campbell Barton <ideasman42@gmail.com>
Thu, 7 Dec 2017 13:21:54 +0000
(
00:21
+1100)
1
2
build_files/cmake/platform/platform_win32.cmake
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
build_files/cmake/platform/platform_win32.cmake
Simple merge