Julian Eisel 15bb6e63e8 Fix errors from conflicts in last merge ...

Handled merge conflicts wrong apparently. When checking changes before
committing, everything seemed fine...

2020-02-04 20:22:06 +01:00

..

blender

Fix errors from conflicts in last merge

2020-02-04 20:22:06 +01:00

creator

Merge branch 'blender-v2.82-release'

2020-01-31 13:03:15 +01:00

tools @ 603f076606

UI: Ellipsis Character for Line Continuation

2020-02-01 08:35:08 -08:00

CMakeLists.txt

ClangFormat: apply to source, most of intern

2019-04-17 06:21:24 +02:00