diff options
| author | D G Turner | 2012-07-16 01:24:40 +0100 |
|---|---|---|
| committer | D G Turner | 2012-07-16 01:24:40 +0100 |
| commit | e73dffa57cbe65ffb10af4f2a5b47f644269caab (patch) | |
| tree | 191c3e8e2ebdf81dec58d4006a98ca20a688120b /base | |
| parent | 9669b73ca811af9672215748e92acb3f77805b75 (diff) | |
| parent | 1fffbe40ceb82bec77479c56176abeff0d2bd5e5 (diff) | |
| download | scummvm-rg350-e73dffa57cbe65ffb10af4f2a5b47f644269caab.tar.gz scummvm-rg350-e73dffa57cbe65ffb10af4f2a5b47f644269caab.tar.bz2 scummvm-rg350-e73dffa57cbe65ffb10af4f2a5b47f644269caab.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/resources.cpp
Diffstat (limited to 'base')
| -rw-r--r-- | base/internal_version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/internal_version.h b/base/internal_version.h index 5392012169..40ed67ceec 100644 --- a/base/internal_version.h +++ b/base/internal_version.h @@ -16,4 +16,4 @@ #define SCUMMVM_REVISION #endif -#define SCUMMVM_VERSION "1.5.0git" SCUMMVM_REVISION +#define SCUMMVM_VERSION "1.6.0git" SCUMMVM_REVISION |