Merge ef919dda4d into 3c0a09bf5c

Browse source

...

This commit is contained in:

Matthew Lowe 2014-10-08 12:55:50 +00:00

parent 3c0a09bf5c ef919dda4d

commit b131b3847d

14 changed files with 6062 additions and 435 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

BIN

cockatrice/resources/appicon.ico

View file

Binary file not shown.

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

986

cockatrice/resources/back.svg

View file

File diff suppressed because one or more lines are too long

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

BIN

cockatrice/resources/cockatrice.png

View file

Binary file not shown.

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

419

cockatrice/resources/cockatrice.svg

View file

File diff suppressed because one or more lines are too long

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

4289

cockatrice/resources/hand.svg

View file

File diff suppressed because one or more lines are too long

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