[xvkbd/epel7: 4/4] Merge branch 'master' into epel7

[Christopher Meng]

commit ddb350ae3f15a9c60f75431dbc98938bd4ef5c51
Merge: e1a4352 7fc418c
Author: Christopher Meng <i at cicku.me>
Date:   Sun Feb 15 18:57:18 2015 +0800

    Merge branch 'master' into epel7

 .gitignore |    1 +
 sources    |    3 +--
 xvkbd.spec |   21 ++++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --cc xvkbd.spec
index dade150,4b10df7..441ed99
--- a/xvkbd.spec
+++ b/xvkbd.spec
@@@ -52,8 -52,20 +52,11 @@@ install -pDm644 %{S:2} %{buildroot}%{_d
  %{_datadir}/applications/%{name}.desktop
  
  %changelog
+ * Sun Feb 15 2015 Christopher Meng <rpm at cicku.me> - 3.6-1
+ - Update to 3.6
+ 
 -* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Mon Jul 15 2013 Christopher Meng <rpm at cicku.me> - 3.5-1
- - Update to 3.5.
+ - Update to 3.5
  
  * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-7
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild