diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/version.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 9287e8515cc..f5bf6e2c855 100644 --- 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. * |