Author: kuemmel
Date: Sun Jul 18 23:23:26 2010
New Revision: 34981
URL: http://www.lyx.org/trac/changeset/34981
Log:
merged build: macro name has changed
Modified:
lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp
Modified: lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp Sun Jul 18 23:01:44
2010 (r34980)
+++ lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp Sun Jul 18 23:23:26
2010 (r34981)
@@ -21,7 +21,7 @@
#include <QLineEdit>
#include <QPushButton>
-#if defined(LYX_MERGED_BUILD) && !defined(Q_CC_MSVC)
+#if defined(LYX_MERGE_FILES) && !defined(Q_CC_MSVC)
// GCC couldn't find operator==
namespace lyx {
bool operator==(lyx::docstring const & d, char const * c);
