upgrade to shutter-0.86.4

Merge branch 'f12/master' into f13/master
Conflicts: .gitignore sources
2010-09-13 20:06:20 +08:00 · 2010-09-13 19:53:11 +08:00 · 2010-09-13 19:50:12 +08:00 · 2010-09-13 19:43:27 +08:00 · 2010-09-13 19:40:33 +08:00 · 2010-09-13 19:32:56 +08:00
1 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,8 @@
+<<<<<<< HEAD
 shutter-0.86.2.tar.gz
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> f12/master
 /shutter-0.86.4.tar.gz
+>>>>>>> master
Author	SHA1	Message	Date
Fedora	1cc6f3a747	upgrade to shutter-0.86.4	2010-09-13 20:06:20 +08:00
Fedora	e37e6671f1	Merge branch 'f12/master' into f13/master Conflicts: .gitignore sources	2010-09-13 19:53:11 +08:00
Fedora	df7e12fff8	upgrade to shutter-0.86.4	2010-09-13 19:50:12 +08:00
Fedora	bc31f2012e	upgrade to shutter-0.86.4	2010-09-13 19:43:27 +08:00
Fedora	7075647b24	Merge branch 'master' into f12/master Conflicts: .gitignore shutter.spec sources	2010-09-13 19:40:33 +08:00
Fedora	24444db1d6	Merge branch 'master' into f13/master Conflicts: .gitignore shutter.spec sources	2010-09-13 19:32:56 +08:00
Fedora Release Engineering	529e40e1d1	dist-git conversion	2010-07-29 12:45:57 +00:00
Fedora Release Engineering	974698207f	dist-git conversion	2010-07-29 12:45:57 +00:00
Liang Suilong	cdceafeab0	IMport Liang's update	2010-05-06 15:03:18 +00:00
Liang Suilong	3d661c7ab9	IMport Liang's update	2010-05-06 14:59:50 +00:00
Liang Suilong	8a49219112	* empty log message *	2010-05-06 14:44:23 +00:00
Liang Suilong	d3073bc49a	* empty log message *	2010-04-19 13:00:58 +00:00
Liang Suilong	b1110b7929	* empty log message *	2010-04-19 12:29:41 +00:00
Liang Suilong	e4cec149d0	* empty log message *	2010-03-02 11:49:42 +00:00
Liang Suilong	75c7434af2	* empty log message *	2010-03-02 11:45:41 +00:00
Liang Suilong	4d65fb73f9	* empty log message *	2010-02-17 17:22:57 +00:00
Jesse Keating	0c6ae74e96	Initialize branch F-13 for shutter	2010-02-17 03:10:50 +00:00
Liang Suilong	cd3e700b6f	* empty log message *	2009-12-07 13:10:39 +00:00
Liang Suilong	fa6d915049	* empty log message *	2009-12-07 13:06:59 +00:00
Bill Nottingham	caf006bdd7	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:39:38 +00:00
Bill Nottingham	cdd349e718	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-25 23:15:31 +00:00
Liang Suilong	ae0a72978e	import Liang's Update	2009-11-23 05:00:47 +00:00
Jesse Keating	7f56d7d17f	Initialize branch F-12 for shutter	2009-09-29 06:50:52 +00:00