git.maemo.org Git - qtmeetings/commit

author	Jan Lapinkataja <jan.lapinkataja@ixonos.com>
	Thu, 28 May 2009 12:29:09 +0000 (15:29 +0300)
committer	Jan Lapinkataja <jan.lapinkataja@ixonos.com>
	Thu, 28 May 2009 12:29:09 +0000 (15:29 +0300)
commit	e12a1507ed7ade95f1c8f4a8e55daa9814df9423
tree	2b8a777623d9db6016b031eaf7f1e937e840a900	tree \| snapshot
parent	fe81ee95cd3d2341c0fb4b45add15d4d07d30f53	commit \| diff
parent	eb6ca54521e6bef025029bab59bea3b76f7daa40	commit \| diff

Confilct solved

Conflicts:
src/BusinessLogic/UIManager.h

Unnamed repository; edit this file to name it for gitweb.

src/BusinessLogic/UIManager.cpp	diff1 \|	diff2 \|	blob \| history
src/BusinessLogic/UIManager.h	diff1 \|	diff2 \|	blob \| history