Merge branch 'master' into contact_dialog
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 3 Sep 2010 08:26:34 +0000 (11:26 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 3 Sep 2010 08:26:34 +0000 (11:26 +0300)
commit3aefae816c853b03156c62727998b5007fee7314
treebbb641d14fa22037bdaf6fa565b416ca71679fe2
parent898981ebb1ca9980f64f3f79040a4d5bee5c5b06
parent33ab5ac709825d14dbbfdc9174f47b1c38e832a2
Merge branch 'master' into contact_dialog

Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listview.h
src/ui/mainwindow.h
21 files changed:
images.qrc
res/images/contact_btn.png
res/images/contact_btn_d.png
res/images/contact_btn_s.png
src/engine/contactmanager.h
src/engine/contactmanagerprivate.cpp
src/engine/contactmanagerprivate.h
src/engine/contactmanagerprivatestub.cpp
src/engine/contactmanagerprivatestub.h
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/friendlistitem.cpp
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listview.cpp
src/ui/listview.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/ossoabookdialog.cpp
src/ui/ossoabookdialog.h