QTfrontend/res/keyconflict.png
author raptor <buckyballreaction@gmail.com>
Fri, 16 Aug 2019 10:59:50 -0600
changeset 15338 c4d68ab7aecb
parent 14905 505c8d101be3
permissions -rw-r--r--
Merge 0.9.25 branch pre-macOS fixes. Discard desyncing changes at nemo's direction
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14905
505c8d101be3 Frontend: Highlight key conflicts
Wuzzy <Wuzzy2@mail.ru>
parents:
diff changeset
     1
(binary:image/png)