Merge pull request #95 from fire/travis-pull-request
authorManuel Nickschas <sputnick@quassel-irc.org>
Mon, 22 Sep 2014 18:14:20 +0000 (20:14 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Mon, 22 Sep 2014 18:14:20 +0000 (20:14 +0200)
commita120760c2fe56a1af07aef6405a5940c8fbe97c6
tree68673e715c75dc787c4043dfce7dab6e6a797de8
parentf51494caaac1f102d5f28a026ccce871312ddd94
parentd17bd4700b0e8380690acb3955f0b786673fcf2e
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.