]> granicus.if.org Git - taglib/commit
Merge remote-tracking branch 'gperks/master'
authorLukáš Lalinský <lalinsky@gmail.com>
Thu, 28 Jul 2011 17:03:46 +0000 (19:03 +0200)
committerLukáš Lalinský <lalinsky@gmail.com>
Thu, 28 Jul 2011 17:03:46 +0000 (19:03 +0200)
commit0730076a0f15e802f5fb1168fc127b1092b4b5df
tree278602a4f8b44c10fa04bb60dae2483895e335dc
parent364a840d832cbf8ed88b38a38aa596f6cddfe868
parent19484c059dc4ccbd99c16e740e1d9c0db6e65b1c
Merge remote-tracking branch 'gperks/master'

Conflicts:
taglib/asf/asfpicture.cpp
taglib/it/itproperties.h
CMakeLists.txt
taglib/mod/modproperties.h
taglib/s3m/s3mproperties.h
taglib/xm/xmproperties.h