[NearTree/el6: 7/7] Merge branch 'master' into el6
tmatsuu
tmatsuu at fedoraproject.org
Mon Jun 20 12:48:31 UTC 2011
commit ffdfc8b517a513f7a6e7a43830c6870e1f6d44fd
Merge: 51f738f f8863e8
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date: Mon Jun 20 21:47:48 2011 +0900
Merge branch 'master' into el6
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