zorkow 94b0d7d1ee Merge branch 'develop' into integrate_keyboard_events ... Conflicts: unpacked/jax/output/CommonHTML/jax.js		2015-09-01 18:30:46 +01:00
..
config	Change CHTML-preview to FHTML-preview, and make it backward compatible.	2015-08-05 17:53:27 -04:00
extensions	Merge branch 'develop' into integrate_keyboard_events	2015-09-01 18:30:46 +01:00
jax	Merge branch 'develop' into integrate_keyboard_events	2015-09-01 18:30:46 +01:00
localization	Update copyright dates.	2015-01-29 10:21:06 -05:00
MathJax.js	Merge branch 'chtml' into develop. Issue #1051.	2015-09-01 08:13:11 -04:00