[lookup: 2/2] merge

[Wes Hardaker]

commit 632cdcd7efddc04a40f88384accf5bb036fa6962
Merge: 1147c4b 406d8cf
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Aug 8 10:16:35 2013 -0700

    merge

 lookup.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc lookup.spec
index caf7bc1,d27b864..53340cd
--- a/lookup.spec
+++ b/lookup.spec
@@@ -67,9 -67,12 +67,15 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/applications/lookup.desktop
  
  %changelog
 +* Wed Feb 20 2013 Wes Hardaker <wjhns174 at hardakers.net> - 2.0-1
 +- 2.0 release
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Mon Oct 15 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.14-2
  - new upstream 1.14 (no real changes though)