[doxygen/f13/master: 9/9] Merge branch 'master' into f13

[Than Ngo]

commit 9bbd17c5f5a5f741b30d6621f67b558c70b31d1a
Merge: b12342f 3895a4c
Author: Than Ngo <than at redhat.com>
Date:   Mon Feb 14 12:32:01 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	doxygen.spec
    	sources

 .gitignore                                         |    4 +-
 ...imestamp.patch => doxygen-1.7.3-timestamp.patch |   45 ++++++++++----------
 doxygen.spec                                       |   21 ++++++++-
 sources                                            |    2 +-
 4 files changed, 44 insertions(+), 28 deletions(-)
---
diff --cc doxygen.spec
index 1a0867e,ec4df31..9f4e0ab
--- a/doxygen.spec
+++ b/doxygen.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A documentation system for C/C++
  Name: doxygen
- Version: 1.7.1
+ Version: 1.7.3
 -Release: 2%{?dist}
 +Release: 1%{?dist}
  Epoch: 1
  Url: http://www.stack.nl/~dimitri/doxygen/index.html
  Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
@@@ -97,6 -97,24 +97,21 @@@ rm -rf %{buildroot
  %{_mandir}/man1/doxywizard*
  
  %changelog
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7.3-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
+ * Mon Jan 17 2011 Than Ngo <than at redhat.com> - 1.7.3-1
+ - 1.7.3
+ - bz#661107
+ 
+ * Fri Nov 12 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.7.2-2
+ - Wrong Buildrequire to qt-devel (#651064)
+ 
+ * Mon Oct 11 2010 Than Ngo <than at redhat.com> - 1.7.2-1
+ - 1.7.2
+ 
+ * Wed Sep 08 2010 Than Ngo <than at redhat.com> - 1:1.7.1-2
+ - bz#629286, apply patch to fix broken thread handling
+ - bz#627553, #define in included file in different directory not handled properly
+ - Inherited documentation doesn't work in case of multiple inheritance
+ 
  * Mon Jul 19 2010 Than Ngo <than at redhat.com> - 1.7.1-1
  - 1.7.1