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
..
attic	Get rid of all traces of libintl.	2013-05-30 22:10:01 +02:00
autotests	cmake export tests.	2014-03-16 09:57:31 +01:00
checkurls	Use prototypes in perl scripts	2014-01-24 11:00:07 +01:00
cmake	Cmake build: Assign package name dynamically	2014-04-18 10:52:48 -04:00
coding	Fix bibliography indentation throughout LyX 2.1 source (part of #7458).	2013-01-12 08:41:59 +01:00
cygwin	Setup .gitignore for generated files	2012-03-22 02:16:12 +01:00
HTML	Update HTML notes again.	2011-04-03 13:38:05 +00:00
keystest
lyxserver
MacOSX	Update MacOSX Readme to latest fileformat	2014-03-23 17:49:37 +01:00
mathmacros
tools	Fix various typos in LFUNs.lyx	2014-02-13 14:20:43 +01:00
Win32	installer: fix a bug with file associations	2014-03-30 05:33:55 +02:00
.gitignore	Setup .gitignore for generated files	2012-03-22 02:16:12 +01:00
expectedTestFailures	Cmake build tests: update comments	2013-08-25 18:18:19 +02:00
FORMAT	FORMAT file for last commit.	2013-05-30 10:30:01 -04:00
LyX-Mac-binary-release.sh	improved Qt frameworks packaging on Mac	2014-03-04 22:28:40 +01:00
lyx.package.README	Creat source package with 'make package_source' from inside the build directory	2011-05-23 08:44:32 +00:00
lyx.rpm.README	Typos	2012-06-05 12:22:13 +02:00
lyx.spec.in
Makefile.am	Update source list	2013-08-28 14:20:59 +02:00