cloud.milkyroute.net Git - dolphin.git/commit

author	Frank Reininghaus <frank78ac@googlemail.com>
	Sun, 27 Jan 2013 14:25:47 +0000 (15:25 +0100)
committer	Frank Reininghaus <frank78ac@googlemail.com>
	Sun, 27 Jan 2013 14:25:47 +0000 (15:25 +0100)
commit	1bd91417dbb7752795ca763d221a7e39c99985aa
tree	67c691ccc1fc1d21c9bc75d006d8d91ef1e0ee6c	tree
parent	f76f3a165419b048f9f8bcdfcb40042397b9af9b	commit \| diff
parent	891ee0c41a3b2e80aa8191a6f8152c6095ce0351	commit \| diff

Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
dolphin/src/tests/kfileitemmodeltest.cpp