Merge branch 'master' of git://git.lyx.org/lyx

# By Scott Kostyshak
# Via Scott Kostyshak
* 'master' of git://git.lyx.org/lyx:
  Prevent zombie processes (#8774)

Merge branch 'master' of git://git.lyx.org/lyx

# By Uwe Stöhr (2) and others
# Via Juergen Spitzmueller
* 'master' of git://git.lyx.org/lyx:
  Fix toggling of 'misc' font options (bug #8764)
  Fix mis-spelling of "contirbutor".
  LaTeXFeatures.cpp: fix bug #8731
  Preamble.cpp: fix bug #8723
  Fix failing test caused by 89b2c54c00.

Merge branch 'master' of git://git.lyx.org/lyx

# By Georg Baum (1) and others
# Via Juergen Spitzmueller
* 'master' of git://git.lyx.org/lyx:
  Fix state of certain language packages (polyglossia, japanese) in children (#8779)
  Fix tests which were forgotten in c7cdac6561.
  Fix crash reported by Scott on the list. The test on latexname() was obviously wrong. We want to know if we are in the same layout, and that is not enough.

Merge branch 'master' of git://git.lyx.org/lyx

# By Juergen Spitzmueller (6) and others
# Via Juergen Spitzmueller
* 'master' of git://git.lyx.org/lyx:
  de.po
  Fix setting of is_child runparam if grandchildren are involved
  Establish missing connections to change_adaptor
  Adding wrap-around pop-up question to simple find and replace dialog (fixing enhancement request #1262).
  add frameworks to linker flags for Mac OS X
  pkg-config is not usable with self made Qt libs
  Bug in 'Use non-tex fonts' checkbox auto-toggling (#8717)
  Fix encoding problems in citation labels by using docstring (not string) where appropriate
  Fix logic error that led to bug #8777. I have no idea what I was previously thinking.
  Add Josh Hieronymous.
  Quick workaround for detection of Qt/Mac using pkg-config
  Trivial fix: escape ampersands in file names before pushing to tab header (#8757)
  Update system identifier in DOCTYPE of MathML-including exported XHTML. From Josh Hieronymous.

Merge branch 'master' of git://git.lyx.org/lyx

# By Richard Heck (7) and others
# Via Richard Heck
* 'master' of git://git.lyx.org/lyx:
  Convert "i = i +1" to "i += 1" and similar.
  Somehow this line got commented out.
  Fix dumb mistake.
  Simplify a bunch of lyx2lyx code.
  Remove debugging code.
  Move helper functions where they belong.
  Fix problem with Initial layout conversion reported by Scott on the list.
  1.) Make po-file differences more robust. 2.) Automatic search for repository-type (git, hg, svn) 3.) Unified command-line  e.g for revision params (-rHEAD~3 == -rHEAD-3 == -r-3).
  typo
  Export tests in cmake build: Do not use the default userdir while running lyx.
  CMake: xvkbd: Check whether the list exists
  CMake: xvkbd: Fix spelling
  CMake: xvkbd: Compile fix if none of the libraries is found
  Change default of Japanese docs to dvipdfm(x)
  I seem to need this to let the 'Lang' keyword work, within *-in.txt files.
  When agreeing to wrap-around, but nothing is found, keep the cursor where it originally was. Now this is coherent with Advanced F&R.
  Fixed a number of bugs in "preserve first case" feature of Advanced F&R (addressing #8383).

Conflicts:
	lib/doc/ja/UserGuide.lyx

trying to mimic CMake as used by Qt Creator

Merge branch 'master' of git://git.lyx.org/lyx

# By Enrico Forestieri (3) and others
# Via Scott Kostyshak
* 'master' of git://git.lyx.org/lyx:
  ja/splash.lyx: default output is now dvipdfm(x)
  Japanese UserGuide.lyx: update fileformat
  ja.po: translations for LyX 2.1 from Koji
  Japanese docs: translations and corrections from Koji
  Fix the fix to the decimal separator problem with Qt5
  Update it.po
  Fix Qt5 decimal separator bug
  Fix compiling on platforms lacking setenv
  enable automake version 1.14

Conflicts:
	.gitignore
	lib/doc/ja/UserGuide.lyx

Merge branch 'master' of git://git.lyx.org/lyx

# By Kornel Benko (1) and Scott Kostyshak (1)
# Via Scott Kostyshak
* 'master' of git://git.lyx.org/lyx:
  Typo
  * sk.po

Merge branch 'temp'

* temp:
  trying to mimic CMake as used by Qt Creator
  adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)
  removed FindQt4.cmake, because it is part of CMake made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)
  added experimental script to determine the SVN version number of a LyX document tree
  exclude cmake-generated files
  Added .gitattributes as suggested by GitHub
  fixed path names after working directory rename
  updated build environment: - renamed folders - updated .gitignore files
  my build environment

my build environment

updated build environment:
- renamed folders
- updated .gitignore files

fixed path names after working directory rename

Added .gitattributes as suggested by GitHub

Adding .gitattributes seems to trigger some changes in existing files.
These changes should only affect line endings.

exclude cmake-generated files

added experimental script to determine the SVN version number of a LyX document tree

removed FindQt4.cmake, because it is part of CMake
made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)

adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)

trying to mimic CMake as used by Qt Creator

my build environment

updated build environment:
- renamed folders
- updated .gitignore files

fixed path names after working directory rename

exclude cmake-generated files

trying to mimic CMake as used by Qt Creator

my build environment

updated build environment:
- renamed folders
- updated .gitignore files

fixed path names after working directory rename

Added .gitattributes as suggested by GitHub

Adding .gitattributes seems to trigger some changes in existing files.
These changes should only affect line endings.

exclude cmake-generated files

added experimental script to determine the SVN version number of a LyX document tree

removed FindQt4.cmake, because it is part of CMake
made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)

adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)

trying to mimic CMake as used by Qt Creator

my build environment

updated build environment:
- renamed folders
- updated .gitignore files

fixed path names after working directory rename

Added .gitattributes as suggested by GitHub

Adding .gitattributes seems to trigger some changes in existing files.
These changes should only affect line endings.

my build environment

updated build environment:
- renamed folders
- updated .gitignore files

fixed path names after working directory rename

Added .gitattributes as suggested by GitHub

Adding .gitattributes seems to trigger some changes in existing files.
These changes should only affect line endings.

exclude cmake-generated files

added experimental script to determine the SVN version number of a LyX document tree

removed FindQt4.cmake, because it is part of CMake
made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)

adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)

trying to mimic CMake as used by Qt Creator

my build environment

updated build environment:
- renamed folders
- updated .gitignore files

fixed path names after working directory rename

Added .gitattributes as suggested by GitHub

Adding .gitattributes seems to trigger some changes in existing files.
These changes should only affect line endings.

exclude cmake-generated files

added experimental script to determine the SVN version number of a LyX document tree

removed FindQt4.cmake, because it is part of CMake
made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)

adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)

trying to mimic CMake as used by Qt Creator

my build environment

inserted newline at the end of the file

Merge branch 'master' of https://github.com/apex-hughin/LyX

* 'master' of https://github.com/apex-hughin/LyX:
  trying to mimic CMake as used by Qt Creator
  adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)
  removed FindQt4.cmake, because it is part of CMake made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)
  added experimental script to determine the SVN version number of a LyX document tree
  exclude cmake-generated files
  Added .gitattributes as suggested by GitHub
  fixed path names after working directory rename
  updated build environment: - renamed folders - updated .gitignore files
  my build environment
  trying to mimic CMake as used by Qt Creator
  adaptations for Qt 5.1.0 (Q_WS_* macros were renamed to Q_OS_*)
  removed FindQt4.cmake, because it is part of CMake made adjustments in CMakeLists.txt so CMake finds QT5 (5.1.0)
  added experimental script to determine the SVN version number of a LyX document tree
  exclude cmake-generated files
  Added .gitattributes as suggested by GitHub
  fixed path names after working directory rename
  updated build environment: - renamed folders - updated .gitignore files
  my build environment

Conflicts:
	.gitignore
Additional.lyx: describe some more multicolumn features
es.po: translations for LyX 2.1 from Ignacio
Fix comment in configure.ac. This was causing a warning during
configuration.
Somehow forgot HTML tags for Paragraph and Subparagraph.

Vincent, this is totally trivial and so should be fine.
Fix bug #8746: Images have to have alt tags.
- cs.po fetch from branch.
cs.po - start 2.1 translations.
es.po: translation for LyX 2.1 from Ignacio
Spanish Additional.lyx: translations for LyX 2.1 from Ignacio
Spanish Additional.lyx: fix a wrong language tag
German UserGuide.lyx: fix a typo spotted by Stephan
German UserGuide.lyx: fix a typo spotted by a user
Document the Bidi class a bit

This is from information given by the auther (Dekel Tsur).
Add introduction to cursor related classes, written by JMarc.
Fix beamer frame conversion
Update ANNOUNCE
Update RELEASE-NOTES
Fix a typo
ANNOUNCE: beta releases can be downloaded from ftp