Public Git Hosting - jkt-jerboa.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d1e3e74 e3b6f6a)

commit	7f50c2259d42df1d13859576b1838353299935ee
author	Jan Kundrát <jkt@gentoo.org>
	Sat, 7 Feb 2009 10:47:04 +0000 (7 11:47 +0100)
committer	Jan Kundrát <jkt@gentoo.org>
	Sat, 7 Feb 2009 10:47:04 +0000 (7 11:47 +0100)
tree	b39c47572818a0a9d7672d874eebf104e6bc123b	tree \| snapshot (tar.gz zip)
parent	d1e3e742b530fa4040a0c1e35c6844360ced37d3	commit \| diff
parent	e3b6f6af99786fa0e1ecf1ad7b64388578746f2a	commit \| diff

Merge branch 'master' of git.fredemmott.co.uk/repo/yanihp

Conflicts:
src/core/CollectionModel.cpp
src/core/PlayerWindow.cpp
src/core/PlayerWindow.h
src/core/PlaylistModel.cpp

include/Util.h	diff1 \|	diff2 \|	blob \| history
src/core/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/core/PlayerWindow.cpp	diff1 \|	diff2 \|	blob \| history
src/core/PlayerWindow.h	diff1 \|	diff2 \|	blob \| history
src/core/PlaylistModel.cpp	diff1 \|	diff2 \|	blob \| history
src/core/PlaylistModel.h	diff1 \|	diff2 \|	blob \| history
src/core/Util.cpp	diff1 \|	diff2 \|	blob \| history

jkt's branch of Jerboa, a music player