Changeset 7276 for anuga_core/source/anuga/lib/maxasc/test2.expected.lic

Timestamp:

Jun 30, 2009, 2:07:41 PM (16 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/lib/maxasc/test2.expected.lic (modified) (2 diffs)

anuga_core/source/anuga/lib/maxasc/test2.expected.lic

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
+<?xml version='1.0' encoding='iso-8859-1'?>
 <ga_license_file>
   <metadata>
@@ -8 +7 @@
   <datafile>
     <filename>test2.expected.asc</filename>
-    <checksum>-1336376197</checksum>
+    <checksum>2958591099</checksum>
     <publishable>Yes</publishable>
     <accountable>Ross Wilson</accountable>