Merge branch '0.6.x'
commit89d593799c238b8da48c85aa6739f1868636f574
authorAndrzej Rybczak <electricityispower@gmail.com>
Sat, 13 Jun 2015 19:14:41 +0000 (13 21:14 +0200)
committerAndrzej Rybczak <electricityispower@gmail.com>
Sat, 13 Jun 2015 19:14:41 +0000 (13 21:14 +0200)
treeb8677099ad1d2cfd39b0c95cffc75a2d012de34f
parentfac92e17aa5e34c8790cb0be2c6b878e1e2b6d6f
parent310d280cef4cc93738412efbd80ada4322df9d17
Merge branch '0.6.x'
NEWS
src/song.cpp
src/status.cpp