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

This commit is contained in:
Uwe Stöhr 2013-05-30 18:15:57 +02:00
commit 6baa65119b

View File

@ -31,7 +31,7 @@ extern char const * const lyx_version_info;
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
#define LYX_FORMAT_LYX 474 // rgh: dummy format change for Chunk switch
#define LYX_FORMAT_TEX2LYX 474
#define LYX_FORMAT_TEX2LYX 473
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER