[pcl/f15: 11/12] Merge branch 'master' into f15
Tim Niemueller
timn at fedoraproject.org
Thu Apr 19 19:18:43 UTC 2012
commit 220900af11d7adddc978f7322fc6c16c3027926e
Merge: 282691c 41aede2
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Thu Apr 19 15:28:24 2012 +0200
Merge branch 'master' into f15
Conflicts:
pcl.spec
.gitignore | 2 +
PCL-1.3.1-Source-fedora.patch | 38 +++++--
PCL-1.4.0-Source-fedora.patch | 73 +++++++++++
pcl-1.3.1-gcc47.patch | 263 +++++++++++++++++++++++++++++++++++++++++
pcl-1.5.1-gcc47.patch | 82 +++++++++++++
pcl.spec | 39 +++++--
sources | 2 +-
7 files changed, 480 insertions(+), 19 deletions(-)
---
More information about the scm-commits
mailing list