From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Sun, 24 Jun 2012 17:48:44 +0000 (+0100)
Subject: Merge branch 'master' into generated
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=49ff95c3648ec46cd85c28cfbe99312c281c82e9;p=francis%2Fexcafe_benchmarks.git

Merge branch 'master' into generated

Conflicts:
	.gitignore
---

49ff95c3648ec46cd85c28cfbe99312c281c82e9
diff --cc .gitignore
index 69e36a4,f0fb820..0a39350
--- a/.gitignore
+++ b/.gitignore
@@@ -11,3 -11,16 +11,11 @@@
  /mass_matrix_2d/mass_matrix_f?_p?_q?.ufl
  /mass_matrix_2d/mass_matrix_f?_p?_q?_tensor.ufl
  /mass_matrix_2d/mass_matrix_f?_p?_q?_quadrature.ufl
 -/mass_matrix_2d/mass_matrix_f?_p?_q?_tensor.h
 -/mass_matrix_2d/mass_matrix_f?_p?_q?_quadrature.h
 -/mass_matrix_2d/mass_matrix_f?_p?_q?_excafe.h
+ /laplacian_2d/ufl_rules.mk
+ /laplacian_2d/benchmark_f?_p?_q?
+ /laplacian_2d/benchmark_f?_p?_q?.cpp
+ /laplacian_2d/laplacian_f?_p?_q?.cpp
+ /laplacian_2d/laplacian_f?_p?_q?.ufl
+ /laplacian_2d/laplacian_f?_p?_q?_tensor.ufl
+ /laplacian_2d/laplacian_f?_p?_q?_quadrature.ufl
 -/laplacian_2d/laplacian_f?_p?_q?_tensor.h
 -/laplacian_2d/laplacian_f?_p?_q?_quadrature.h
 -/laplacian_2d/laplacian_f?_p?_q?_excafe.h
++>>>>>>> master