From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sun, 13 Jun 2010 18:59:13 +0000 (-0700)
Subject: Merge remote branch 'trondeau/qtmake' into maint
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=51416adfdc330fe0d4edbfcd5df839de66ef2759;p=debian%2Fgnuradio

Merge remote branch 'trondeau/qtmake' into maint

* trondeau/qtmake:
  Fixes gr-qtgui make distcheck failure when QT is not installed.
---

51416adfdc330fe0d4edbfcd5df839de66ef2759
diff --cc gr-qtgui/src/lib/Makefile.am
index 26b97d1d,5377bf07..6d4a9125
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@@ -1,5 -1,5 +1,5 @@@
  #
--# Copyright 2008,2009 Free Software Foundation, Inc.
++# Copyright 2008,2009,2010 Free Software Foundation, Inc.
  # 
  # This file is part of GNU Radio
  #