From: Callum <c.e.schofield@hotmail.com>
Date: Tue, 29 Oct 2013 15:59:27 +0000 (-0700)
Subject: Merge pull request #71 from Callum-/dilatometer
X-Git-Url: https://git.ucc.asn.au/?p=matches%2FMCTX3420.git;a=commitdiff_plain;h=537721537d5b62e02a5e05d363f548d1c6a48299;hp=d1cf38a35e41662c7258b68ca649a0802172c3ba

Merge pull request #71 from Callum-/dilatometer

changed some variables to defines
---

diff --git a/reports/final/raw/jeremy/project writeup.doc b/reports/final/raw/jeremy/project writeup.doc
index b0d4534..92e05ae 100644
Binary files a/reports/final/raw/jeremy/project writeup.doc and b/reports/final/raw/jeremy/project writeup.doc differ
diff --git a/testing/Camera/test_blurred.jpg b/testing/Camera/test_blurred.jpg
deleted file mode 100644
index 78c484d..0000000
Binary files a/testing/Camera/test_blurred.jpg and /dev/null differ
diff --git a/testing/Camera/test_edge.jpg b/testing/Camera/test_edge.jpg
deleted file mode 100644
index 9b076f8..0000000
Binary files a/testing/Camera/test_edge.jpg and /dev/null differ
diff --git a/testing/Camera/test_edge_avg.jpg b/testing/Camera/test_edge_avg.jpg
deleted file mode 100644
index 45ff0bd..0000000
Binary files a/testing/Camera/test_edge_avg.jpg and /dev/null differ
diff --git a/testing/Camera/testimage.jpg b/testing/Camera/testimage.jpg
deleted file mode 100644
index caaf9e6..0000000
Binary files a/testing/Camera/testimage.jpg and /dev/null differ