jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 19:18:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into devel

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-03-23 12:18:16 +01:00
commit 10d958c4ce
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/carddatabase.h
View file

@ -165,6 +165,7 @@ protected:
QThread *pictureLoaderThread;
PictureLoader *pictureLoader;
private:
static const int versionNeeded;
void loadCardsFromXml(QXmlStreamReader &xml);
void loadSetsFromXml(QXmlStreamReader &xml);
public: