Merge branch 'master' into issue/344

# Conflicts:
#	src/gameinfoimpl.cpp
#	src/gameinfoimpl.h
#	src/shared/fallout3info.h
#	src/shared/falloutnvinfo.h
#	src/shared/gameinfo.h
#	src/shared/oblivioninfo.h
#	src/shared/skyriminfo.h

1 files changed, 0 insertions, 41 deletions

diff --git a/src/gameinfoimpl.h b/src/gameinfoimpl.h
deleted file mode 100644
index b7ac78c5..00000000
--- a/src/gameinfoimpl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*

-Copyright (C) 2012 Sebastian Herbord. All rights reserved.

-

-This file is part of Mod Organizer.

-

-Mod Organizer is free software: you can redistribute it and/or modify

-it under the terms of the GNU General Public License as published by

-the Free Software Foundation, either version 3 of the License, or

-(at your option) any later version.

-

-Mod Organizer is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#ifndef GAMEINFOIMPL_H

-#define GAMEINFOIMPL_H

-

-

-#include <igameinfo.h>

-#include <QString>

-

-

-class GameInfoImpl : public MOBase::IGameInfo

-{

-public:

-  GameInfoImpl();

-

-  virtual Type type() const;

-  virtual QString path() const;

-  virtual QString binaryName() const;

-  virtual QString version() const;

-  virtual QString extenderVersion() const;

-

-};

-

-#endif // GAMEINFOIMPL_H