Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Tue, 10 Aug 2010 07:13:54 +0000 (09:13 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Tue, 10 Aug 2010 07:13:54 +0000 (09:13 +0200)
commit95ba4a5306d80093226f0e3feb093f4a783a91f3
treedf3240d2ab5dab5c162aafd095b2daa6f75cce12
parent4543ce1ddeff26c74f2a03143e777c8dd3f6a80d
parent7d972d4260bac9790ad0616a3c8f63ab716eddb2
Merge branch 'master' into backbone
trunk/src/base/gui/main.cpp