From: Junio C Hamano <junkio@cox.net>
Date: Wed, 9 May 2007 05:46:56 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc3~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4662231e5654924c78fcb4b630fb48c58b945b7f;p=git.git

Merge branch 'maint'

* maint:
  GIT v1.5.1.4
  Add howto files to rpm packages.
  wcwidth redeclaration
  user-manual: fix clone and fetch typos
---

4662231e5654924c78fcb4b630fb48c58b945b7f
diff --cc git.spec.in
index 556bdda7a,b0ea62884..9de655c18
--- a/git.spec.in
+++ b/git.spec.in
@@@ -183,12 -166,12 +183,15 @@@ rm -rf $RPM_BUILD_ROO
  %defattr(-,root,root)
  %{_datadir}/git-core/
  %doc README COPYING Documentation/*.txt
- %{!?_without_docs: %doc Documentation/*.html }
+ %{!?_without_docs: %doc Documentation/*.html Documentation/howto}
  
  %changelog
+ * Tue May 8 2007 Quy Tonthat <qtonthat@gmail.com>
+ - Added howto files
+ 
 +* Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru>
 +- Added the git-p4 package: Perforce import stuff.
 +
  * Mon Feb 13 2007 Nicolas Pitre <nico@cam.org>
  - Update core package description (Git isn't as stupid as it used to be)