[NearTree/el5: 7/7] Merge branch 'master' into el5
tmatsuu
tmatsuu at fedoraproject.org
Mon Jun 20 12:50:23 UTC 2011
commit 05ae6e7919e6ba214098e008848555d0a1708fac
Merge: e295f16 f8863e8
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date: Mon Jun 20 21:49:26 2011 +0900
Merge branch 'master' into el5
Conflicts:
NearTree.spec
NearTree-2.4.tar.gz | Bin 106761 -> 0 bytes
...2.3.1-fedora.patch => NearTree-3.1-fedora.patch | 12 ++++--------
...e-2.3.2-lib64.patch => NearTree-3.1-lib64.patch | 20 ++++++++++----------
NearTree-3.1.tar.gz | Bin 0 -> 141820 bytes
NearTree.spec | 14 ++++++++++----
5 files changed, 24 insertions(+), 22 deletions(-)
---
More information about the scm-commits
mailing list