diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-29 21:22:07 +0100 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-29 21:22:07 +0100 |
| commit | 691dd7aa973e9f3d92735b673cb836eb3378b435 (patch) | |
| tree | 3d8f8ebbfa650dd42e19bb18c9a972157b0fb61a /src/net/comm.h | |
| parent | c7991f4c5dc41cb282d839179c043c4a028d135e (diff) | |
| parent | 930b41f48bf2a3a84b6256350452d90c584a3ab0 (diff) | |
fixed merge conflict
Diffstat (limited to 'src/net/comm.h')
| -rw-r--r-- | src/net/comm.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/net/comm.h b/src/net/comm.h index f8715ac..58dbaf8 100644 --- a/src/net/comm.h +++ b/src/net/comm.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * 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/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * 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/>. * + * * + **************************************************************************/ #ifndef OXEN_NET_H #define OXEN_NET_H |