[shutter/f13/master: 9/9] Merge branch 'master' into f13/master

[Liang Suilong]

commit 24444db1d60676392171122463020c057a31ab59
Merge: 9746982 cc5c54e
Author: Fedora <liangsuilong at gmail.com>
Date:   Mon Sep 13 19:32:56 2010 +0800

    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore
    	shutter.spec
    	sources

 .gitignore   |    4 ++++
 shutter.spec |   15 +++++++++++++++
 sources      |    4 ++++
 3 files changed, 23 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 1739fc4,261b569..231cdc1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  shutter-0.86.2.tar.gz
++<<<<<<< HEAD
++=======
+ /shutter-0.86.4.tar.gz
++>>>>>>> master
diff --cc shutter.spec
index 1fc50e0,c397652..a3c3a4f
--- a/shutter.spec
+++ b/shutter.spec
@@@ -1,6 -1,6 +1,10 @@@
  #%define  ppa_version ppa6
  Name:		shutter
++<<<<<<< HEAD
 +Version:	0.86.2
++=======
+ Version:	0.86.4
++>>>>>>> master
  Release:	1%{?dist}
  Summary:	GTK+ 2.0 screenshot application written in perl
  Group:		Applications/Multimedia
@@@ -67,9 -67,14 +71,20 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/%{name}
  %{_mandir}/man1/%{name}*
  %{_datadir}/pixmaps/%{name}.png
++<<<<<<< HEAD
 +%{_datadir}/icons/hicolor/*/apps/%{name}.*
 +
 +%changelog
++=======
+ %{_datadir}/icons/hicolor/*/apps/*.*
+ %{_datadir}/icons/ubuntu-mono-*/*/apps/%{name}-panel.*
+ 
+ %changelog
+ * Mon Sep 13 2010 Liang Suilong <liangsuilong at gmail.com> - 0.86.4-1
+ - Upgrade to shutter-0.86.2
+ - Add icons for new version
+ 
++>>>>>>> master
  * Thu May 05 2010 Liang Suilong <liangsuilong at gmail.com> - 0.86.2-1
  - Upgrade to shutter-0.86.2
  - Add BR: hicolor-icon-theme
diff --cc sources
index a44cb54,aa1369c..5de4e21
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +7261c53d5e36b0c7c32aaba2a3714384  shutter-0.86.2.tar.gz
++=======
+ 874a4b5a113d81f4c83bc67b5a4a029a  shutter-0.86.4.tar.gz
++>>>>>>> master