Merge branch 'master' into QJson_Experiments QJson_Experiments
authorDavid Solbach <d@vidsolbach.de>
Wed, 15 Dec 2010 18:19:40 +0000 (19:19 +0100)
committerDavid Solbach <d@vidsolbach.de>
Wed, 15 Dec 2010 18:19:40 +0000 (19:19 +0100)
commit3cab79554bb4af15c5058d502d6eda3911eaf3b3
treebe4faea178b48f2c393584c2e70ce092c46edd1f
parentdd2b5f6dad3d5a80d51b58d4c7e3238ee1fb8986
parentaf84772ec507c0be9e4f7d0cf50738f0afbde884
Merge branch 'master' into QJson_Experiments

Conflicts:
src/src/mainwidget.cpp
buliscores.pro.user
src/src.pro
src/src/backendkicker.cpp
src/src/mainwidget.cpp
src/src/matchdaymodel.cpp