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/guichan/image.cpp | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/guichan/image.cpp')
| -rw-r--r-- | src/guichan/image.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/guichan/image.cpp b/src/guichan/image.cpp index 09129e61f..5e3af0716 100644 --- a/src/guichan/image.cpp +++ b/src/guichan/image.cpp @@ -7,7 +7,7 @@ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ * * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * * Per Larsson a.k.a finalman |