Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
William A. Kennington III
2015-05-01 15:57:09 -07:00
122 changed files with 2018 additions and 323 deletions
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
description = "This project is a QML port of qtermwidget";
description = "A QML port of qtermwidget";
homepage = "https://github.com/Swordifish90/qmltermwidget";
license = with stdenv.lib.licenses; [ gpl2 ];
platforms = stdenv.lib.platforms.linux;