[qtav/f25: 3/3] Merge branch 'master' into f25

[Martin Gansser]

commit 7ceb425edb4a93ceb04570e9a5a324bf446641df
Merge: 751b728 71b5371
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Sep 17 11:38:20 2016 +0200

    Merge branch 'master' into f25

 .gitignore |  1 +
 qtav.spec  | 12 ++++++++----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --cc qtav.spec
index d65fa02,a3ca5b0..946dd12
--- a/qtav.spec
+++ b/qtav.spec
@@@ -222,8 -222,12 +222,12 @@@ f
  %{_datadir}/icons/hicolor/*/apps/QtAV.svg
  
  %changelog
+ * Sat Sep 17 2016 Martin Gansser <martinkg at fedoraproject.org> - 1.11.0-0.5gitbc46ae4
+ - Update to 1.11.0-0.5gitbc46ae4
+ - Dropped config option no_config_tests
+ 
  * Fri Sep 02 2016 Martin Gansser <martinkg at fedoraproject.org> - 1.11.0-0.4gitc5db90b
 -- Disabled config test by adding no_config_tests
 +- Disabled config test by adding no-tests
  
  * Mon Aug 29 2016 Martin Gansser <martinkg at fedoraproject.org> - 1.11.0-0.3gitc5db90b
  - update to last git release