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/test | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | mv-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz mv-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 mv-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz mv-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/testlauncher.cpp | 2 | ||||
| -rw-r--r-- | src/test/testlauncher.h | 2 | ||||
| -rw-r--r-- | src/test/testmain.cpp | 2 | ||||
| -rw-r--r-- | src/test/testmain.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 2b1ea448a..917b8eedb 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h index ba462175d..23314cc41 100644 --- a/src/test/testlauncher.h +++ b/src/test/testlauncher.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index a305ae239..aa3254275 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * diff --git a/src/test/testmain.h b/src/test/testmain.h index 0385822dc..f2913fe30 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * |