Merge branch 'about'
authorNikolay Tischenko <niktischenko@gmail.com>
Sun, 12 Dec 2010 17:29:19 +0000 (23:29 +0600)
committerNikolay Tischenko <niktischenko@gmail.com>
Sun, 12 Dec 2010 17:29:19 +0000 (23:29 +0600)
commit81618d0495ef34c57c574cc49630124cf1581fd9
treeb019500d42591df2db42458ed70dc25d1fe20f10
parent4b2b6eb742c9cde279a727cec11130e0da40620f
parent48aed8da27b223cec83faddb98a8d591fcc2d6f4
Merge branch 'about'

Conflicts:
someplayer.pro
someplayer.pro
src/mainwindow.cpp
src/mainwindow.h
src/player/player.cpp