Changeset 7276 for anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test-z-mux.lic

Timestamp:

Jun 30, 2009, 2:07:41 PM (14 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_validation/automated_validation_tests/urs_mux_files_validation/o_test-z-mux.lic (modified) (2 diffs)

anuga_validation/automated_validation_tests/urs_mux_files_validation/o_test-z-mux.lic

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-  <ga_license_file>
+<?xml version='1.0' encoding='iso-8859-1'?>
+<ga_license_file>
     <metadata>
       <author>Duncan Gray</author>
@@ -7 +6 @@
     <datafile>
       <filename>o_test-z-mux</filename>
-      <checksum>-1449856062</checksum>
+      <checksum>2845111234</checksum>
       <publishable>Yes</publishable>
       <accountable>Duncan Gray</accountable>