Merge remote-tracking branch 'upstream/master'

This commit is contained in:
lighta 2014-05-03 03:11:34 -04:00
commit 1c1914fa41

View File

@ -2,7 +2,7 @@
// For more information, see LICENCE in the main folder // For more information, see LICENCE in the main folder
#ifndef _INTIF_H_ #ifndef _INTIF_H_
#define _INFIF_H_ #define _INTIF_H_
//#include "../common/mmo.h" //#include "../common/mmo.h"
struct party_member; struct party_member;