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

author	Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
	Sun, 25 May 2014 12:43:18 +0000 (14:43 +0200)
committer	Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
	Sun, 25 May 2014 12:43:18 +0000 (14:43 +0200)
commit	fa36c3fd1f53a223f43bb57d7c28e431a889a7c2
tree	ddf2c2747d952babbdbcebb12c5d661953aef744	tree
parent	a46121dc510f987f2d164b43eaf5f84ea8c83cb8	commit \| diff
parent	4fe788f1157426e819f1ba31d1ee6388759cfd18	commit \| diff

Merge branch 'master' into frameworks

Conflicts:
dolphin/src/statusbar/statusbarspaceinfo.cpp