[boost141/el4/master: 3/3] Merge remote branch 'origin/el5/master' into el4
Robert Scheck
robert at fedoraproject.org
Mon Mar 14 01:12:13 UTC 2011
commit eac51b487ddf2441188be2e8dfbeb0f8066bf318
Merge: a42aa63 f2cd613
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Mar 14 02:09:26 2011 +0100
Merge remote branch 'origin/el5/master' into el4
Conflicts:
sources
.gitignore | 1 +
boost-1.41.0-mapnik.patch | 21 +
boost-1.41.0-shared_ptr_serialization.patch | 14 +
boost-cmake-soname.patch | 19 +
boost-graph-compile.patch | 12 +
boost141.spec | 1238 +++++++++++++++++++++++++++
dead.package | 1 -
sources | 1 +
8 files changed, 1306 insertions(+), 1 deletions(-)
---
More information about the scm-commits
mailing list