diff options
author | krzys-h <krzys_h@interia.pl> | 2014-10-14 15:42:19 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-10-14 15:42:19 +0200 |
commit | f65b00089ac537f9e37d0d4b7f44881fed4a09f1 (patch) | |
tree | 2b2073c2de3ee8161ae6f034253c7e8b3973c549 /src/app/app.cpp | |
parent | eab300c3a0e94120f934b75b8f16d200ba594a38 (diff) | |
parent | 9fd6cf54492cedd7f6231a0b1d0655120cb1c4d7 (diff) | |
download | colobot-f65b00089ac537f9e37d0d4b7f44881fed4a09f1.tar.gz colobot-f65b00089ac537f9e37d0d4b7f44881fed4a09f1.tar.bz2 colobot-f65b00089ac537f9e37d0d4b7f44881fed4a09f1.zip |
Merge branch 'dev' into dev-physfs
Conflicts:
data
Diffstat (limited to 'src/app/app.cpp')
-rw-r--r-- | src/app/app.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index fad7a32..150fb87 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -1,19 +1,21 @@ -// * This file is part of the COLOBOT source code -// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch -// * Copyright (C) 2012, Polish Portal of Colobot (PPC) -// * -// * This program 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. -// * -// * This program 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 this program. If not, see http://www.gnu.org/licenses/. +/* + * This file is part of the Colobot: Gold Edition source code + * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam + * http://epsiteŃ.ch; http://colobot.info; http://github.com/colobot + * + * This program 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. + * + * This program 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 this program. If not, see http://gnu.org/licenses + */ #include "common/config.h" |