?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 965cb60) | patch
Remove conflict marker.
commitf00d47a36f231efd49b8088cd74c9b092f9dbc4a
authorAndreas Schwab <schwab@suse.de>
Wed, 21 Jan 2009 23:14:12 +0000 (21 23:14 +0000)
committerAndreas Schwab <schwab@suse.de>
Wed, 21 Jan 2009 23:14:12 +0000 (21 23:14 +0000)
treef87e95c4553798a8854a773a9562a50e10a5a262tree | snapshot (tar.gz zip)
parent965cb60a21674edb8e20b1a2a41297bcd4622361commit | diff
Remove conflict marker.

Properly handle partial reads.
    Ulrich Drepper  <drepper@redhat.com>
Reported by Peter Festner <peter.festner@ewetel.net>.
    Tomas Janousek  <tjanouse@redhat.com>
    Ulrich Drepper  <drepper@redhat.com>
ChangeLog diff | blob | blame | history
Petr Baudis' queue of bugfixes for stable glibc branches