[clfft] 29/109: Merge remote-tracking branch 'upstream/develop' into macosx

[Jérôme Kieffer]

This is an automated email from the git hooks/post-receive script.

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit 60dfdea0bdaf4a47798d21a594c4fe0e445bb21f
Merge: 24ce704 4854ff2
Author: Kent Knox <kent.knox at amd>
Date:   Mon Oct 14 22:05:25 2013 -0500

    Merge remote-tracking branch 'upstream/develop' into macosx

 src/library/generator.copy.cpp      |  2 +-
 src/library/generator.stockham.cpp  | 29 +++++++++++++++++++++++------
 src/library/generator.transpose.cpp |  2 +-
 src/library/plan.cpp                | 14 +++++++-------
 src/library/plan.h                  |  4 ++--
 5 files changed, 34 insertions(+), 17 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git