[pyqt-mail-checker/f18: 3/3] Version 2.0.6

f1ash f1ash at fedoraproject.org
Wed Nov 27 17:34:50 UTC 2013


commit 6cd5eef73ecc0890fbdca8cd2597a73471dfff19
Merge: 160b6dd 47a2007
Author: F1ash <kaperang07 at gmail.com>
Date:   Wed Nov 27 21:34:18 2013 +0400

    Version 2.0.6

 2.0.6.tar.gz           |  Bin 0 -> 122869 bytes
 pyqt-mail-checker.spec |   10 ++++++++++
 sources                |    4 ++++
 3 files changed, 14 insertions(+), 0 deletions(-)
---
diff --cc pyqt-mail-checker.spec
index 2288c45,0da92cc..8a7d304
--- a/pyqt-mail-checker.spec
+++ b/pyqt-mail-checker.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name: pyqt-mail-checker
++<<<<<<< HEAD
 +Version: 2.0.5
++=======
+ Version: 2.0.6
++>>>>>>> master
  Release: 1%{?dist}
  Summary: Applet periodically checking for new messages in the mailboxes
  Summary(ru): Апплет периодически проверяет наличие новых писем в списке почтовых ящиков
@@@ -64,6 -64,9 +68,12 @@@ f
  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Mon Nov 25 2013 Fl at sh <kaperang07 at gmail.com> - 2.0.6-1
+ - version updated;
+ 
++>>>>>>> master
  * Sat Sep 14 2013 Fl at sh <kaperang07 at gmail.com> - 2.0.5-1
  - version updated;
  
diff --cc sources
index 0765d12,f08b18b..342a1bf
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +e8c066bba53a771f473af5faa378cfb9  2.0.5.tar.gz
++=======
+ 2394c457753d0c402d8bd74037c8accf  2.0.6.tar.gz
++>>>>>>> master


More information about the scm-commits mailing list