[clfft] 118/128: merging pradeep branch after conflic fixes

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit 7fb5f7868adab059526484f4820300abb5181811
Merge: 044fe01 1dac82e
Author: bragadeesh <bragadeesh.natarajan at amd.com>
Date:   Wed Oct 14 11:47:53 2015 -0700

    merging pradeep branch after conflic fixes

 src/tests/CMakeLists.txt                     |    1 +
 src/tests/accuracy_test_pow2_precallback.cpp |    2 +-
 src/tests/accuracy_test_pow3_precallback.cpp |    2 +-
 src/tests/accuracy_test_pow5_precallback.cpp |    2 +-
 src/tests/accuracy_test_pow7_precallback.cpp | 1085 ++++++++++++++++++++++++++
 src/tests/test_constants.h                   |   12 +-
 6 files changed, 1095 insertions(+), 9 deletions(-)

diff --cc src/tests/test_constants.h
index 530eda1,5431bc1..10981d3
--- a/src/tests/test_constants.h
+++ b/src/tests/test_constants.h
@@@ -96,10 -96,10 +96,10 @@@
  				return ret; \n \
  				}
  
--typedef struct USER_DATA  
--				{  
--				float scalar1;  
--				float scalar2; 
++typedef struct USER_DATA
++				{
++				float scalar1;
++				float scalar2;
  				} USER_DATA;
  
  #define CALLBCKSTR(...) #__VA_ARGS__

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