Inaugural merge from branch 'pre-0.67'.

Browse Source

This is a 'merge -s ours', making no change to master but just
recording an ancestry relationship to make further merges from the
release branch easy.

...

This commit is contained in:

Simon Tatham 2016-02-29 19:59:37 +00:00

parent cfbe604d06 51586b6f26

commit 3ad0c89fec

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available