[flowblade/f24: 2/2] Merge branch 'master' into f24
commit ab45e33d9104accb0a6cafaaddcfdd02f4460b60
Merge: 9114c9d afa0538
Author: Martin Gansser <mgansser(a)alice.de>
Date: Thu Dec 15 21:46:05 2016 +0100
Merge branch 'master' into f24
.gitignore | 1 +
flowblade.spec | 15 ++++++++-------
sources | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
---