-
Jannis Pohlmann authored
For some reason "git merge --squash" didn't preserve squashed commit information after resolving the conflicts manually. So here the changes are explained in detail in the extra ChangeLog.
561a0fa3
To find the state of this project's repository at the time of any of these versions, check out the tags.