Joe Thornber 8b2ec7a3aa Merge branch 'master' into v0.7-devel ...

Conflicts:
	VERSION
	persistent-data/space-maps/disk.cc
	persistent-data/space-maps/disk.h

2016-03-22 12:04:51 +00:00

..

careful_alloc.cc

put space map checking back in

2014-02-19 16:08:05 +00:00

careful_alloc.h

move space maps to their own sub directory

2013-01-10 21:36:38 +00:00

core.h

put space map checking back in

2014-02-19 16:08:05 +00:00

disk_structures.h

Merge branch 'low_level_examine_metadata' into merge-show-blocks

2016-02-24 15:24:43 +00:00

disk.cc

Merge branch 'master' into v0.7-devel

2016-03-22 12:04:51 +00:00

disk.h

Merge branch 'master' into v0.7-devel

2016-03-22 12:04:51 +00:00

recursive.cc

Merge branch 'master' into space-map-checking

2015-04-07 12:18:23 +01:00

recursive.h

move space maps to their own sub directory

2013-01-10 21:36:38 +00:00

subtracting_span_iterator.h

Take out some 'typename's to support older versions of gcc (Heinz).

2013-08-15 10:35:07 +01:00