| commit | 9613644a310980beaaafc84f20e55520818b89b0 | |
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Mon, 3 Oct 2016 22:23:19 +0000 (3 23:23 +0100) | ||
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Mon, 3 Oct 2016 22:23:19 +0000 (3 23:23 +0100) | ||
| tree | a220faf9b38aa54b55702d5002a91345b7566dd7 | treesnapshot (tar.gz zip) |
| parent | 34fe0a7041399811df33e9e64d51707b5fa9579b | commitdiff |
| parent | b5f325cb4a0d986689177857a62007027a532d31 | commitdiff |
Merge branch 'rs/use-modern-git-merge-syntax' into pu