From fc76a9ca7b72612f943a13c8b3af7334c05ee99d Mon Sep 17 00:00:00 2001 From: netblue30 Date: Mon, 2 Apr 2018 08:37:07 -0400 Subject: merges --- README | 9 ++++++--- README.md | 2 +- src/firecfg/firecfg.config | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index d20e956cd..4f9bba945 100644 --- a/README +++ b/README @@ -34,10 +34,10 @@ Maintainer: Committers - Fred-Barclay (https://github.com/Fred-Barclay) -- Reiner Herrmann (https://github.com/reinerh) +- Reiner Herrmann (https://github.com/reinerh - Debian/Ubuntu maintainer) - smithsohu (https://github.com/smitsohu) - SkewedZeppelin (https://github.com/SkewedZeppelin) -- startx2017 (https://github.com/startx2017) - 0.9.38-LTS and *bugfixes branches maintainer +- startx2017 (https://github.com/startx2017) - 0.9.38-LTS and *bugfixes branches maintainer) - Topi Miettinen (https://github.com/topimiettinen) - Vincent43 (https://github.com/Vincent43) - netblue30 (netblue30@yahoo.com) @@ -276,6 +276,8 @@ iiotx (https://github.com/iiotx) - use generic.profile by default Impyy (https://github.com/Impyy) - added mumble profile +intika (https://github.com/intika) + - added musixmatch profile irregulator (https://github.com/irregulator) - thunderbird profile fixes for debian stretch Irvine (https://github.com/Irvinehimself) @@ -362,8 +364,9 @@ Matthew Gyurgyik (https://github.com/pyther) - rpm spec and several fixes maxice8 (https://github.com/maxice8) - fixed missing header -melvinvermeeren (https://github.com/melvinvermeeren) +Melvin Vermeeren (https://github.com/melvinvermeeren) - added teamspeak3 profile + - added --noautopulse command line option Michael Haas (https://github.com/mhaas) - bugfixes Mike Frysinger (vapier@gentoo.org) diff --git a/README.md b/README.md index 4d9727797..a464c2c09 100644 --- a/README.md +++ b/README.md @@ -308,4 +308,4 @@ Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed, discord-can pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing, Kaffeine, pdfchain, tilp, vivaldi-snapshot, bitcoin-qt, VS Code, falkon, gnome-builder, lobase, asunder, gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2.8, -thunderbird-beta, ncdu, gnome-logs, gcloud +thunderbird-beta, ncdu, gnome-logs, gcloud, musixmatch diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 1f56e2532..c06291294 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config @@ -262,6 +262,7 @@ mumble mupdf mupen64plus musescore +musixmatch mutt natron nautilus -- cgit v1.2.3-54-g00ecf