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
..
clipart	documentation files: port recent changes from branch	2012-02-19 04:41:01 +00:00
Additional.lyx	Additional.lyx: update version name to "2.1.x"	2014-04-11 01:05:57 +02:00
Customization.lyx	Fix conflicting inset font defaults (bug #8874)	2014-02-10 22:06:32 +01:00
DocumentBidon1.lyx	Update docs to latest fileformat	2014-03-23 17:49:35 +01:00
DocumentBidon2.lyx	Update docs to latest fileformat	2014-03-23 17:49:35 +01:00
DocumentTexteBidon.txt	fr/EmbeddedObjects.lyx: can now export with LuaTeX	2013-04-05 03:33:27 -04:00
EmbeddedObjects.lyx	EmbeddedObjects.lyx, UserGuide.lyx: describe feature to move table rows/columns	2014-04-18 10:52:46 -04:00
Formula-numbering.lyx	Update docs to latest fileformat	2014-03-23 17:49:35 +01:00
Intro.lyx	Update docs to latest fileformat	2014-03-23 17:49:35 +01:00
Math.lyx	manuals: fix 2 typos spotted by Ignacio	2014-04-11 01:16:54 +02:00
Shortcuts.lyx	Update docs to latest fileformat	2014-03-23 17:49:35 +01:00
Tutorial.lyx	documentation files: more updates	2014-01-30 00:14:59 +01:00
UserGuide.lyx	UserGuide.lyx: describe the last missing new feature of LyX 2.1	2014-04-18 10:53:39 -04:00