commit 323471d0a245ef7b1e7f35cdc6d777d59a29b866 Merge: e0c6d49 5baf5d0 Author: Ben Rosser <rosser.bjr(a)gmail.com&gt; Date: Thu Jun 18 17:40:55 2020 -0400 Merge branch 'master' into f32 .gitignore | 2 ++ dfhack.spec | 11 +++++++---- git-describe.h | 8 ++++---- sources | 8 ++++---- 4 files changed, 17 insertions(+), 12 deletions(-) ---