Yevgeny Makarov d28676d89a UI: Move the 'Resolve Conflict' button closer to the text data-block ...

Moves the Text Editor 'Resolve Conflict' button closer to data-block selector and with 'Question' icon.

Differential Revision: https://developer.blender.org/D9266

Reviewed by Hans Goudey

2020-10-27 16:30:37 -07:00

..

bin

Cleanup: spelling

2017-04-27 21:41:03 +10:00

darwin

macOS: improve design of .dmg background

2020-07-16 17:28:27 +02:00

datafiles

Sculpt/Paint: Add Paint Studio Light preset

2020-10-26 20:35:37 +01:00

freedesktop

Linux: 2.90 release information in appdata

2020-08-31 11:21:01 +02:00

license

License: Rename GPL2 license to match the name specified in copyright.txt

2020-10-02 12:18:02 +02:00

scripts

UI: Move the 'Resolve Conflict' button closer to the text data-block

2020-10-27 16:30:37 -07:00

text

Move license files to license subfolder

2020-09-24 12:49:36 +02:00

windows

Cleanup: pep8 (indentation, spacing, long lines)

2020-10-02 11:59:16 +10:00