[ascii-design/epel7: 9/9] Merge branch 'master' into epel7

[Christopher Meng]

commit 35c136938ccd8e8815e16e0efa14cf4f85903316
Merge: b0de7ce 1bd3c8d
Author: Christopher Meng <i at cicku.me>
Date:   Mon Jun 23 12:32:21 2014 +0800

    Merge branch 'master' into epel7
    
    Conflicts:
    	ascii-design.spec

 .gitignore                                      |    2 +
 ascii-design-1.1.0-appdata-syntax-cleanup.patch |   50 +++++++++++++++++++++++
 ascii-design.spec                               |   34 +++++++++------
 sources                                         |    3 +-
 4 files changed, 74 insertions(+), 15 deletions(-)
---
diff --cc ascii-design.spec
index 6c30698,31ac9d6..1ca7637
--- a/ascii-design.spec
+++ b/ascii-design.spec
@@@ -41,7 -46,16 +46,10 @@@ appdata-validate --nonet %{buildroot}%{
  %{_datadir}/pixmaps/%{name}.png
  
  %changelog
+ * Fri Jun 20 2014 Christopher Meng <rpm at cicku.me> - 1.1.0-1
+ - Update to 1.1.0
+ 
 -* Wed Jun 11 2014 Christopher Meng <rpm at cicku.me> - 1.0.3-1
 -- Update to 1.0.3
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Fri Jan 24 2014 Christopher Meng <rpm at cicku.me> - 1.0.2-2
 +* Fri Jan 24 2014 Christopher Meng <rpm at cicku.me> - 1.0.2-1
  - Use proper compiler flags to build.
  
  * Thu Jul 25 2013 Christopher Meng <rpm at cicku.me> - 1.0.2-1