[cmor] 176/190: Merge branch 'devel'

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit 763c0719fa6e141b0dabfb2607eb857ba4b38bc1
Merge: 72835d2 bee5936
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Tue Dec 3 11:01:10 2013 -0800

    Merge branch 'devel'

 Makefile.in                            | 110 ++++++++++++---------
 RELEASE-NOTES                          |   5 +
 Src/cmor.c                             |  19 +++-
 Src/cmor_axes.c                        | 104 ++++++++++++--------
 Src/cmor_variables.c                   |  44 ++++++---
 Test/cmor_speed_and_compression.py     |   3 +-
 Test/cmor_speed_and_compression_01.py  |   2 +-
 Test/test_compression.py               |   2 +-
 Test/test_lon_gt_360.py                |  71 ++++++++++++++
 Test/test_lon_thro_360.py              |  73 ++++++++++++++
 Test/test_python_jamie_11.py           | 171 +++++++++++++++++++++++++++++++++
 Test/test_python_joerg_2.py            |   1 +
 Test/test_python_joerg_tim2_clim_02.py |  62 ++++++++++++
 Test/test_python_user_interface_01.py  |   2 +-
 Test/test_site_ts.py                   |  76 +++++++++++++++
 Test/test_time_gap_multi_write.py      |  69 +++++++++++++
 Test/test_time_gap_single_write1.py    |  69 +++++++++++++
 Test/test_time_gap_single_write2.py    |  70 ++++++++++++++
 configure                              |  37 ++++---
 configure.ac                           |   9 +-
 include/cmor.h                         |   7 +-
 21 files changed, 883 insertions(+), 123 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git