diff options
author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
---|---|---|
committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/resources/chardb.cpp | |
parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
download | manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/resources/chardb.cpp')
-rw-r--r-- | src/resources/chardb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/chardb.cpp b/src/resources/chardb.cpp index 23a1066ce..577cdc111 100644 --- a/src/resources/chardb.cpp +++ b/src/resources/chardb.cpp @@ -1,7 +1,7 @@ /* * Color database * Copyright (C) 2008 Aethyra Development Team - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * |