diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
| commit | ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a (patch) | |
| tree | 4a66b774bf493e95fc2961236de0ee84b4646362 /open_issues/binutils/log_install.diff | |
| parent | 42dc7198bbea79f4abe15d40804f539ffed1b05b (diff) | |
| parent | 2e315ef11db39e8ee0a0decc054801521ee049dd (diff) | |
| download | web-ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a.tar.gz web-ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a.tar.bz2 web-ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a.zip | |
fix merge conflict
Diffstat (limited to 'open_issues/binutils/log_install.diff')
| -rw-r--r-- | open_issues/binutils/log_install.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/open_issues/binutils/log_install.diff b/open_issues/binutils/log_install.diff index 27dff188..100ebf5c 100644 --- a/open_issues/binutils/log_install.diff +++ b/open_issues/binutils/log_install.diff @@ -1,5 +1,5 @@ ---- /dev/fd/63 2011-10-11 14:23:22.899444227 +0200 -+++ /dev/fd/62 2011-10-11 14:23:22.903444162 +0200 +--- /dev/fd/63 2011-10-22 11:44:48.780903894 +0200 ++++ /dev/fd/62 2011-10-22 11:44:48.780903894 +0200 @@ -68,7 +68,6 @@ libtool: install: /usr/bin/install -c .libs/libbfd.a [...]/hurd/master.build.install/lib/libbfd.a libtool: install: chmod 644 [...]/hurd/master.build.install/lib/libbfd.a |