Merge branch 'stable45'

Browse Source

Conflicts:
	user_manual/sync.rst

...

This commit is contained in:

Daniel Molkentin

2013-02-18 13:09:01 +01:00

parent 9579d662e1 bf831bb7f6

commit 63092cca9a

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

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

Diff Content Not Available