The following changes since commit 13d998f1d84f34d22d2fa1006e2592afd36bb7e3: Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio (2011-05-24 21:36:35 +0200) are available in the git repository at: git://git.kernel.dk/fio.git master Jens Axboe (1): Fio 1.55 init.c | 2 +- os/windows/install.wxs | 2 +- os/windows/version.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) --- Diff of recent changes: diff --git a/init.c b/init.c index 0689f77..d5813c6 100644 --- a/init.c +++ b/init.c @@ -22,7 +22,7 @@ #include "lib/getopt.h" -static char fio_version_string[] = "fio 1.54"; +static char fio_version_string[] = "fio 1.55"; #define FIO_RANDSEED (0xb1899bedUL) diff --git a/os/windows/install.wxs b/os/windows/install.wxs index 2c7ff16..888cb57 100755 --- a/os/windows/install.wxs +++ b/os/windows/install.wxs @@ -2,7 +2,7 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?define VersionMajor = 1?> -<?define VersionMinor = 54?> +<?define VersionMinor = 55?> <?define VersionBuild = 0?> <Product Id="*" diff --git a/os/windows/version.h b/os/windows/version.h index 152489a..e9971c8 100644 --- a/os/windows/version.h +++ b/os/windows/version.h @@ -1,4 +1,4 @@ #define FIO_VERSION_MAJOR 1 -#define FIO_VERSION_MINOR 54 +#define FIO_VERSION_MINOR 55 #define FIO_VERSION_BUILD 0 -#define FIO_VERSION_STRING "1.54" +#define FIO_VERSION_STRING "1.55" -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html