Jamie Peabody e9e0a9d41b Merge branch 'master' of https://github.com/kljh/Mergely ...

Conflicts:
	lib/mergely.js

2014-08-17 15:35:16 +01:00

..

codemirror.css

Morning clean up.

2014-08-17 08:11:13 +01:00

codemirror.js

Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

2013-02-24 21:57:25 +00:00

codemirror.min.js

Fixes rendering issue.

2014-01-25 12:24:01 +00:00

mergely.css

New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize.

2013-05-12 19:52:47 +01:00

mergely.js

Merge branch 'master' of https://github.com/kljh/Mergely

2014-08-17 15:35:16 +01:00

mergely.min.js

Added 'debug' option to editor to make it easier to switch.

2014-08-17 12:11:03 +01:00

searchcursor.js

Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

2013-02-24 21:57:25 +00:00