[dnssec-check/f16: 3/14] merge fixes

[Wes Hardaker]

commit 714c35d0708613a4407108333e429fd3af64a5f8
Merge: a8dc412 a81f967
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Mar 22 12:05:41 2012 -0700

    merge fixes

 ...ec-check-add-missing-function-decl.1.12.1.patch |   11 +++++++++++
 dnssec-check.spec                                  |   13 +++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --cc dnssec-check.spec
index f0fa90b,e893117..354903f
--- a/dnssec-check.spec
+++ b/dnssec-check.spec
@@@ -67,6 -69,12 +69,13 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/applications/dnssec-check.desktop
  
  %changelog
+ * Thu Mar 22 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.12.1-1
+ - Update to 1.12.1
+ 
+ * Fri Feb  3 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.12-3
+ - Patch to use QML
+ 
++>>>>>>> master
  * Thu Feb  2 2012 Wes Hardaker <wjhns174 at hardakers.net> - 1.12-2
  - attempt forced rebuild for new dnssec-tools-libs