From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 22 Sep 2014 18:14:20 +0000 (+0200)
Subject: Merge pull request #95 from fire/travis-pull-request
X-Git-Tag: 0.11.0~9
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a120760c2fe56a1af07aef6405a5940c8fbe97c6;hp=d17bd4700b0e8380690acb3955f0b786673fcf2e

Merge pull request #95 from fire/travis-pull-request

Tell travis to create a matrix of gcc 4.7, clang 3.4, qt4 and qt5.
---