Skip to content
Snippets Groups Projects
Commit 29d0e5fe authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

Merge branch 'master' into gpart_ids 

Conflicts:
	src/common_io.c
	src/gravity/Default/gravity_io.h
	src/tools.c
parents 23f09dde 1ebd9336
Branches
Tags
1 merge request!118One major change to replace all gpart id/parts with the new id_or_neg_offset.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 944 additions and 374 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment