[med-svn] [SCM] aghermann branch, master, updated. c0bd21ca8eb529ade7e0c7aad22951a308a8dc8f

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 97f7f879cfb5dfe734c6d9bad64c55c91e675e47
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Apr 25 16:38:05 2013 +0300

    don't lose embedded annotations in CEDFFile::CEDFFile(CEDFFile&&)

diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 57b9a8d..a5244f9 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -408,6 +408,7 @@ CEDFFile (CEDFFile&& rv)
 	swap( _session,    rv._session);
 
 	swap( channels, rv.channels);
+	swap( common_annotations, rv.common_annotations);
 
 	header_length = rv.header_length;
 	_fsize        = rv._fsize;

-- 
Sleep experiment manager