Merge branch 'pajot-master'
authorJustin Lecher <jlec@gentoo.org>
Thu, 26 Nov 2015 11:43:40 +0000 (12:43 +0100)
committerJustin Lecher <jlec@gentoo.org>
Thu, 26 Nov 2015 11:43:40 +0000 (12:43 +0100)
commitdeb7b700064653a0d7617f9e726096f22d0f89a3
treec45140c59012e86c20920666526b4c1db8d868dc
parentecb69924edab8c6f6813b0b6b433b60f9a9a19dc
parent2a05793c844039179977d07120140d32d41471dd
Merge branch 'pajot-master'

* pajot-master:
  app-office/texmaker: make qt5 default
  app-office/texmaker: version bump to 4.5 #566790

Closes: Github gentoo/gentoo#404