diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
| commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
| tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa/main/version.c | |
| parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
| parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
| download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/version.c')
| -rw-r--r-- | mesalib/src/mesa/main/version.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c index 175f9714e..6dbdb3ac6 100644 --- a/mesalib/src/mesa/main/version.c +++ b/mesalib/src/mesa/main/version.c @@ -25,6 +25,7 @@ #include "imports.h"
#include "mtypes.h"
#include "version.h"
+#include "git_sha1.h"
@@ -185,7 +186,11 @@ compute_version(struct gl_context *ctx) ctx->VersionString = (char *) malloc(max);
if (ctx->VersionString) {
_mesa_snprintf(ctx->VersionString, max,
- "%u.%u Mesa " MESA_VERSION_STRING,
+ "%u.%u Mesa " MESA_VERSION_STRING
+#ifdef MESA_GIT_SHA1
+ " (" MESA_GIT_SHA1 ")"
+#endif
+ ,
ctx->VersionMajor, ctx->VersionMinor);
}
}
|