v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update run.py 

resolve conflict.
pull/859/head
Kim Kulling 2016-04-20 12:37:48 +02:00
parent c122bb2def
commit 69ac97d709
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/regression/run.py
View File

@ -223,11 +223,7 @@ def process_dir(d, outfile_results, zipin, result ):
"dump", "dump",
fullpath, outfile_actual, "-b", "-s", "-l" ] +\ fullpath, outfile_actual, "-b", "-s", "-l" ] +\
pppreset.split() pppreset.split()
<<<<<<< HEAD
print( "command = " + str( command ) ) print( "command = " + str( command ) )
=======
print "command = " + command )
>>>>>>> fe60654c1ad4d665e2fed05b257a06815c7c113f
r = subprocess.call(command, **shellparams) r = subprocess.call(command, **shellparams)
outfile_results.flush() outfile_results.flush()