Kornel Benko fdf6b3a85b 1.) Removed the unconditional set of option LYX_MERGE_FILES if option ...

LYX_INSTALL set.
  Does not compile on ubuntu.
2.) Backport translations handling from trunk


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34975 a592a061-630c-0410-9148-cb99ea01b6c8

2010-07-18 15:25:48 +00:00

..

cat.py

Make it compilable again

2010-07-10 20:00:19 +00:00

CMakeLists.txt

1.) Removed the unconditional set of option LYX_MERGE_FILES if option

2010-07-18 15:25:48 +00:00