rpms/shutter
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'f12/master' into f13/master

Browse source 
Conflicts:
	.gitignore
	sources
This commit is contained in:
Fedora 2010-09-13 19:53:11 +08:00
commit e37e6671f1
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,5 +1,8 @@
<<<<<<< HEAD
shutter-0.86.2.tar.gz
<<<<<<< HEAD
=======
=======
>>>>>>> f12/master
/shutter-0.86.4.tar.gz
>>>>>>> master

4
sources
View file

@ -1,2 +1,6 @@
874a4b5a113d81f4c83bc67b5a4a029a shutter-0.86.4.tar.gz
<<<<<<< HEAD
>>>>>>> master
=======
>>>>>>> f12/master