Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / mesa / main / version.h

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 9287e8515cc2d3e79d7020a510c3904966619cf8..d4d3dd1a94e1dfb87712b4c3a185b65e02ae7adc 100644 (file)
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,12 +1,9 @@
 /*
  * Mesa 3-D graphics library
-<<<<<<< HEAD:src/mesa/main/version.h
- * Version:  7.5
-=======
- * Version:  7.4
->>>>>>> origin/gallium-0.2:src/mesa/main/version.h
+ * Version:  7.6
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,9 +30,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 5
+#define MESA_MINOR 6
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.5-devel"
+#define MESA_VERSION_STRING "7.6-devel"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))