Merge branch 'master' into scrollback-search

Browse Source

Conflicts:
	termite.c

...

This commit is contained in:

Daniel Micay 2012-05-30 04:42:24 -04:00

parent 8910553d3d ca24afcaee

commit b9482f878e

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