These are completely safe, and it seems best to me to keep trunk
and branch in sync whenever possible, as it makes backporting
easier.
(cherry picked from commit a756403301)
Conflicts:
src/BufferParams.cpp
src/tex2lyx/Preamble.cpp
src/tex2lyx/text.cpp
- fix SCons after r28575
- set EOL to native
@ Richard: For new files please always set the EOL flag to native. If possible it would be nice if you can also update SCons manifest file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28576 a592a061-630c-0410-9148-cb99ea01b6c8
