Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolving conflicts

Browse source
This commit is contained in:
Leonardo Murillo 2014-01-14 10:31:47 -06:00
parent 24bedc90a7
commit 4a4b483532
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -89,12 +89,8 @@ const float MIRROR_FULLSCREEN_DISTANCE = 0.35f;
const float MIRROR_REARVIEW_DISTANCE = 0.65f;
const float MIRROR_REARVIEW_BODY_DISTANCE = 2.3f;
<<<<<<< HEAD
const QString CHECK_VERSION_URL = "http://www.google.com";
=======
>>>>>>> a8bbe41642f5ce3152f7e7ca8b9b001c78c2fcdc
void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message) {
fprintf(stdout, "%s", message.toLocal8Bit().constData());
Application::getInstance()->getLogger()->addMessage(message.toLocal8Bit().constData());