Waleed Khan 40e97140d6 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	cockatrice/src/carddatabase.cpp

2014-07-23 00:49:13 -04:00

..

src

Merge remote-tracking branch 'upstream/master'

2014-07-23 00:49:13 -04:00

CMakeLists.txt

Install libraries and plugins automatically under windows

2014-06-27 17:40:29 +02:00

oracle.desktop

added unix desktop icons and menu items to install target

2012-01-29 18:30:02 +01:00