Rebase fixes

This commit is contained in:
r.kuznetsov 2015-09-22 15:49:32 +03:00
parent 8258b9d3bc
commit 46b2162ef9
5 changed files with 0 additions and 35 deletions

View file

@ -1055,7 +1055,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void run()
{
mPlacePage.hide();
Framework.deactivatePopup();
}
});
}

View file

@ -1,12 +1,3 @@
/*
* point.h
* IALib
*
* Created by Sergey Yershov on 04.09.05.
* Copyright 2005 __MyCompanyName__. All rights reserved.
*
*/
#ifndef __IA__POINT__
#define __IA__POINT__

View file

@ -1,12 +1,3 @@
/*
* rect.h
* IALib
*
* Created by Sergey Yershov on 04.09.05.
* Copyright 2005 __MyCompanyName__. All rights reserved.
*
*/
#ifndef __IA__RECT__
#define __IA__RECT__

View file

@ -1,11 +1,3 @@
//
// text_engine.cpp
// FreetypeLabels
//
// Created by Sergey Yershov on 09.03.11.
// Copyright 2011 __MyCompanyName__. All rights reserved.
//
#include "text_engine.h"
#include <sstream>

View file

@ -1,11 +1,3 @@
//
// text_engine.h
// FreetypeLabels
//
// Created by Sergey Yershov on 09.03.11.
// Copyright 2011 __MyCompanyName__. All rights reserved.
//
#pragma once
#ifndef __ML__TEXT_ENGINE_H__
#define __ML__TEXT_ENGINE_H__