lyx_mirror/development
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
..
2013-05-30 22:10:01 +02:00
2014-03-16 09:57:31 +01:00
2014-01-24 11:00:07 +01:00
2011-04-03 13:38:05 +00:00
2010-02-18 09:58:20 +00:00
2014-02-13 14:20:43 +01:00
2013-05-30 10:30:01 -04:00
2012-06-05 12:22:13 +02:00
2010-03-16 09:25:30 +00:00
2013-08-28 14:20:59 +02:00