Merge remote-tracking branch 'origin/master'

Browse Source

Conflicts:
	PowerEditor/src/ScitillaComponent/Buffer.cpp

...

This commit is contained in:

gerr 2015-10-22 15:59:50 +01:00

parent 751069ab83 2a589c820a

commit f632bc3b99

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