Richard Heck 65a049dfa5 Merge branch '2.1.1-staging' into 2.1.x
Conflicts:
	lib/doc/es/EmbeddedObjects.lyx
	lib/doc/es/UserGuide.lyx
	lib/doc/fr/EmbeddedObjects.lyx
	lib/doc/ja/EmbeddedObjects.lyx
	lib/doc/ja/Intro.lyx
	lib/doc/ja/Math.lyx
	lib/doc/ja/Tutorial.lyx
	lib/doc/ja/UserGuide.lyx
	po/ja.po
	src/mathed/InsetMathNest.cpp
2014-04-18 11:08:31 -04:00
..
2007-12-02 22:10:26 +00:00
2011-04-02 11:00:19 +00:00
2011-02-21 19:56:43 +00:00
2003-10-13 09:50:10 +00:00
2014-03-09 13:07:30 +01:00
2013-03-19 00:57:37 +01:00
2014-04-01 21:41:13 +02:00
2013-01-10 21:22:55 +01:00
2014-03-08 10:59:43 +01:00