Merge branch 'exprimental' master
authorMehrdad Momeny <mehrdad.momeny@gmail.com>
Sat, 8 Aug 2009 10:00:47 +0000 (14:30 +0430)
committerMehrdad Momeny <mehrdad.momeny@gmail.com>
Sat, 8 Aug 2009 10:00:47 +0000 (14:30 +0430)
commit54de70260ece12cc0744f579add9a513f9b1f125
treec98f131fae2da62f43d9638cf1a08aa6af4d1fa1
parent6ad9d8298609faa097664a0c14195958bdb71132
parentb6301b5ae540288620cabcf3b9e348af367b88b3
Merge branch 'exprimental'

Conflicts:
choqok/identicasearch.cpp
choqok/identicasearch.h
choqok/mainwindow.cpp
choqok/mainwindow.h
choqok/search.cpp
choqok/search.h
choqok/statuswidget.cpp
choqok/systrayicon.h
choqok/twittersearch.cpp
choqok/twittersearch.h
choqok/config/advanced_base.ui
choqok/mainwindow.cpp
choqok/mainwindow.h
choqok/systrayicon.cpp
choqok/systrayicon.h