Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	cockatrice/src/carddatabase.cpp

...

This commit is contained in:

Waleed Khan

2014-07-23 00:50:16 -04:00

parent 40e97140d6 d663c12689

commit feaa3f5052

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

Diff Content Not Available