From: Roland McGrath <roland@redhat.com>
Date: Tue, 6 Jan 2009 09:04:31 +0000 (-0800)
Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils into libdwfl-decompress
X-Git-Tag: elfutils-0.139~34^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c462c63d43f296cc051f2cfa6ca9b911d8c37404;p=thirdparty%2Felfutils.git

Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils into libdwfl-decompress

Conflicts:
	libdw/ChangeLog
---

c462c63d43f296cc051f2cfa6ca9b911d8c37404
diff --cc libdw/ChangeLog
index eda753d34,eaaab2dda..67b36a510
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,7 -1,10 +1,14 @@@
- 2009-01-05  Roland McGrath  <roland@redhat.com>
++2009-01-06  Roland McGrath  <roland@redhat.com>
 +
 +	* Makefile.am (libdw.so): Link in $(zip_LIBS).
 +
+ 2009-01-06  Ulrich Drepper  <drepper@redhat.com>
+ 
 -	* libdw.h: Add definition for unwind and call frame information.
++	* dwarf.h: Add definition for unwind and call frame information.
+ 
+ 	* memory-access.h: Define read_ubyte_unaligned, read_sbyte_unaligned,
+ 	read_ubyte_unaligned_inc, and read_sbyte_unaligned_inc.
+ 
  2008-08-15  Roland McGrath  <roland@redhat.com>
  
  	* libdw.map (ELFUTILS_0.136): New version set, inherits from