projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8e6337f)
mesa: fix merge conflict (in comment)
authorBrian Paul <brianp@vmware.com>
Wed, 25 Feb 2009 00:53:39 +0000 (17:53 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 25 Feb 2009 00:53:39 +0000 (17:53 -0700)
src/mesa/main/version.h patch | blob | history

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 9287e8515cc2d3e79d7020a510c3904966619cf8..f5bf6e2c855e72ffd8be0f34265b943e7fb2c56a 100644 (file)
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,10 +1,6 @@
 /*
  * 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
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *