diff options
author | Ole Loots <ole@monochrom.net> | 2014-09-12 23:22:26 +0200 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2014-09-12 23:22:26 +0200 |
commit | a9ac9c00fc2c73705db242a459160f14d279cdcd (patch) | |
tree | 5f9aa630340bad67934e6fdbfda7f239f0fade57 /desktop/version.c | |
parent | 181bc41a9aa200cfac5bf4b84175003639fce488 (diff) | |
parent | 9e6b0fb8b07cd3147b0a2727d3644860cf7c8c7e (diff) | |
download | netsurf-a9ac9c00fc2c73705db242a459160f14d279cdcd.tar.gz netsurf-a9ac9c00fc2c73705db242a459160f14d279cdcd.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Conflicts:
atari/gui.h
Diffstat (limited to 'desktop/version.c')
-rw-r--r-- | desktop/version.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/version.c b/desktop/version.c index 11544c01b..44d58715f 100644 --- a/desktop/version.c +++ b/desktop/version.c @@ -1,10 +1,10 @@ -#include "utils/testament.h" +#include "testament.h" -const char * const netsurf_version = "3.1 (Dev" +const char * const netsurf_version = "3.3 (Dev" #if defined(CI_BUILD) " CI #" CI_BUILD #endif ")" ; const int netsurf_version_major = 3; -const int netsurf_version_minor = 0; +const int netsurf_version_minor = 3; |