[clutter-gst/f15/master: 2/2] fix merge

[Peter Robinson]

commit db228c5952be9c2c7f40d6d226266248c60cd1c1
Merge: 6351c47 5384a71
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 6 09:00:08 2011 +0100

    fix merge

 .gitignore       |    4 +---
 clutter-gst.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 7d87c2b,0d9b0d6..8458403
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,1 @@@
--/clutter-gst-1.3.2.tar.bz2
--/clutter-gst-1.3.4.tar.bz2
- /clutter-gst-1.3.6.tar.bz2
 -/clutter-gst-1.3.8.tar.bz2
++clutter-gst-1.3.8.tar.bz2
diff --cc clutter-gst.spec
index 0479b1c,54176fc..9731b95
--- a/clutter-gst.spec
+++ b/clutter-gst.spec
@@@ -62,9 -62,9 +62,12 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gir-1.0/ClutterGst-1.0.gir
  
  %changelog
+ * Wed Apr  6 2011 Peter Robinson <pbrobinson at gmail.com> 1.3.8-1
+ - New upstream 1.3.8 release
+ 
 +* Thu Mar 17 2011 Bastien Nocera <bnocera at redhat.com> 1.3.6-1
 +- Update to 1.3.6
 +
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild