[shutter/f13/master] upgrade to shutter-0.86.4
Liang Suilong
liangsuilong at fedoraproject.org
Mon Sep 13 11:43:52 UTC 2010
commit bc31f2012e8cd7cda93f4aa055bd29d5a52128e8
Author: Fedora <liangsuilong at gmail.com>
Date: Mon Sep 13 19:43:27 2010 +0800
upgrade to shutter-0.86.4
shutter.spec | 10 ----------
sources | 3 ---
2 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/shutter.spec b/shutter.spec
index a3c3a4f..c397652 100644
--- a/shutter.spec
+++ b/shutter.spec
@@ -1,10 +1,6 @@
#%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
@@ -71,11 +67,6 @@ rm -rf $RPM_BUILD_ROOT
%{_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.*
@@ -84,7 +75,6 @@ rm -rf $RPM_BUILD_ROOT
- 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 --git a/sources b/sources
index 5de4e21..65518cc 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-7261c53d5e36b0c7c32aaba2a3714384 shutter-0.86.2.tar.gz
-=======
874a4b5a113d81f4c83bc67b5a4a029a shutter-0.86.4.tar.gz
>>>>>>> master
More information about the scm-commits
mailing list