diff options
| author | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-09 08:17:19 -0800 |
|---|---|---|
| committer | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-09 08:17:19 -0800 |
| commit | 8c943e75db3810f6606b41b99aa9f22c257b364e (patch) | |
| tree | f587fe4fa52e2415c1b110d195140aecd1254cdc /src/common | |
| parent | 5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9 (diff) | |
| parent | 7a8857cbf73d589ded8ef7bcf000063ad0ef1432 (diff) | |
| download | hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.tar.gz hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.tar.bz2 hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.tar.xz hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.zip | |
Merge pull request #3 from HerculesWS/master
Merging Hercules Changes
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/core.c | 2 | ||||
| -rw-r--r-- | src/common/mapindex.c | 2 | ||||
| -rw-r--r-- | src/common/sql.c | 2 | ||||
| -rw-r--r-- | src/common/sql.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/common/core.c b/src/common/core.c index b1714b7a5..42cdfa7cd 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -1,6 +1,6 @@ // Copyright (c) Hercules dev team, licensed under GNU GPL. // See the LICENSE file -// Portions Copyright (c) Athena dev team +// Portions Copyright (c) Athena Dev Teams #include "../common/mmo.h" #include "../common/showmsg.h" diff --git a/src/common/mapindex.c b/src/common/mapindex.c index cea945ac0..685af641c 100644 --- a/src/common/mapindex.c +++ b/src/common/mapindex.c @@ -1,6 +1,6 @@ // Copyright (c) Hercules dev team, licensed under GNU GPL. // See the LICENSE file -// Portions Copyright (c) Athena dev team +// Portions Copyright (c) Athena Dev Teams #include "../common/mmo.h" #include "../common/showmsg.h" diff --git a/src/common/sql.c b/src/common/sql.c index 73c4181d9..b842db46d 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -1,6 +1,6 @@ // Copyright (c) Hercules dev team, licensed under GNU GPL. // See the LICENSE file -// Portions Copyright (c) Athena dev team +// Portions Copyright (c) Athena Dev Teams #include "../common/cbasetypes.h" #include "../common/malloc.h" diff --git a/src/common/sql.h b/src/common/sql.h index 5ac92665e..b7159ec90 100644 --- a/src/common/sql.h +++ b/src/common/sql.h @@ -1,6 +1,6 @@ // Copyright (c) Hercules dev team, licensed under GNU GPL. // See the LICENSE file -// Portions Copyright (c) Athena dev team +// Portions Copyright (c) Athena Dev Teams #ifndef _COMMON_SQL_H_ #define _COMMON_SQL_H_ |