]> git.unchartedbackwaters.co.uk Git - francis/excafe_benchmarks.git/commitdiff
projects / francis / excafe_benchmarks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9870c88 4b91267)
Merge branch 'master' into generated.
authorFrancis Russell <francis@unchartedbackwaters.co.uk>
Fri, 3 Aug 2012 23:37:43 +0000 (00:37 +0100)
committerFrancis Russell <francis@unchartedbackwaters.co.uk>
Fri, 3 Aug 2012 23:37:43 +0000 (00:37 +0100)
Conflicts:
laplacian_2d/Makefile


Trivial merge
Benchmarking scripts/code for Excafé.