From: Toni Jussila <toni.jussila@fudeco.com>
Date: Thu, 22 Apr 2010 07:02:44 +0000 (+0300)
Subject: Conflict fixed: mainwindow.cpp and httpclient.cpp
X-Git-Tag: help~6
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=ac84b058f9433e99aee2f560ef4f4e634d6900f7;hp=ac84b058f9433e99aee2f560ef4f4e634d6900f7;p=speedfreak

Conflict fixed: mainwindow.cpp and httpclient.cpp
---