Merge with master

Browse source

...

This commit is contained in:

Fabio Bas 2015-08-31 22:55:46 +02:00

parent 5cfb034452

commit 6d7baec37b

9 changed files with 87 additions and 416 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

cockatrice/resources/icon_config_shorcuts.svg → cockatrice/resources/config/shorcuts.svg

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 8.6 KiB After Width:  |  Height:  |  Size: 8.6 KiB