[yoshimi/f21: 7/7] Update to 1.2.3

[Brendan Jones]

commit 3f8737a4247202d700a29583a70cbaf03e7a914e
Merge: 9d22840 27513e2
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Wed Sep 3 05:19:26 2014 +0200

    Update to 1.2.3

 .gitignore                           |    2 ++
 sources                              |    2 +-
 yoshimi-1.2.0-Wformat-security.patch |   16 ----------------
 yoshimi.spec                         |   21 +++++++++++++++++----
 4 files changed, 20 insertions(+), 21 deletions(-)
---
diff --cc yoshimi.spec
index 3ab221c,7b9099f..6033095
--- a/yoshimi.spec
+++ b/yoshimi.spec
@@@ -88,11 -88,23 +88,24 @@@ f
  %{_datadir}/icons/hicolor/scalable/apps/%{name}.png
  %{_datadir}/pixmaps/%{name}.png
  %{_datadir}/%{name}/presets/
+ %{_datadir}/icons/%{name}.svg
+ %{_datadir}/appdata/%{name}.appdata.xml
  
  %changelog
- * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
+ * Tue Sep 02 2014 Brendan Jones <brendan.jones.it at gmail.com> 1.2.3-2
+ - Correct notes
+ 
+ * Tue Sep 02 2014 Brendan Jones <brendan.jones.it at gmail.com> 1.2.3-1
+ - Update to 1.2.3
+ 
+ * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
  
+ * Sun Jul 20 2014 Adam Huffman <bloch at verdurin.com> - 1.2.2-1
+ - Update to upstream 1.2.2
+ - Add appdata and new icon
+ 
++>>>>>>> master
  * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild