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

Conflicts:
	lib/mergely.js

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

..

arrow-down-v.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

arrow-left-v.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

arrow-left-vv.png

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

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

arrow-right-v.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

arrow-right-vv.png

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

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

arrow-right.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

arrow-up-v.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

banner.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

check.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

download.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

redo.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

share.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

swap.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

undo.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

upload.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

x-mark.png

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00