[evince/f14/master: 2/2] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/evince into f14

[Matthias Clasen]

commit 01ded9ca78b4411c087ead3c6559b1ffc2f99130
Merge: 272089b cd2a1c7
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Aug 19 22:45:31 2010 -0400

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/evince into f14

 evince.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc evince.spec
index 0824e32,5031e27..4049b9c
--- a/evince.spec
+++ b/evince.spec
@@@ -238,8 -237,8 +238,10 @@@ glib-compile-schemas --allow-any-name %
  %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
  
  %changelog
 +* Thu Aug 19 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.90-1
 +- Update to 2.31.90
+ * Thu Aug 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.31.6.1-2
+ - rebuild (poppler)
  
  * Wed Aug 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.6.1-1
  - Update to 2.31.6.1