diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-27 18:09:50 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-27 18:09:50 +0200 |
| commit | ab8e55a651f71921406bd216ca30f966db81c691 (patch) | |
| tree | 78fc12d70ab9def2771f7176818d4231da0e2299 /src/CBot/old | |
| parent | 4ddcd9f810fa588ccf90442f7b4e5ddf385e85f2 (diff) | |
| parent | 6b846aa62924df0dea4af78c6333f0bd141bda78 (diff) | |
| download | colobot-ab8e55a651f71921406bd216ca30f966db81c691.tar.gz colobot-ab8e55a651f71921406bd216ca30f966db81c691.tar.bz2 colobot-ab8e55a651f71921406bd216ca30f966db81c691.zip | |
Merge branch 'dev' into dev-opengl
Pulled changes & resolved conflicts
Diffstat (limited to 'src/CBot/old')
| -rw-r--r-- | src/CBot/old | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/CBot/old b/src/CBot/old deleted file mode 100644 index ea18736..0000000 --- a/src/CBot/old +++ /dev/null @@ -1,15 +0,0 @@ -// * This file is part of the COLOBOT source code -// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch -// * -// * 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/.
\ No newline at end of file |