Merge branch 'master' of ssh://github.com/alliedmodders/amxmodx into inc-doc

Conflicts:
	plugins/include/amxmodx.inc
	plugins/include/message_const.inc
	plugins/include/sockets.inc
This commit is contained in:
Valentin Grünbacher
2014-08-07 01:44:04 +02:00
560 changed files with 14923 additions and 10253 deletions

View File

@ -1,10 +1,11 @@
/* AMX Mod X constants
*
* by the AMX Mod X Development Team
* originally developed by OLO
*
* This file is provided as is (no warranties).
*/
// vim: set ts=4 sw=4 tw=99 noet:
//
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team.
//
// This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license
#if defined _amxconst_included
#endinput