diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-23 09:14:17 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-23 09:14:17 -0600 |
| commit | 2689dd304c6d644b04c941e6da63e466be5de0d6 (patch) | |
| tree | 26e2878e1d4457205254fcdcc877e3c192e0cec5 /windows | |
| parent | 83f4c444f4e630fe2bfd17ad750f3f17ceff13f6 (diff) | |
| parent | ff54af530bc17429eda73a761dd6b73e3ec0d6ef (diff) | |
Merge branch '7.8'
Conflicts:
Makefile
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_pixel_copy.c
src/mesa/main/version.h
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj b/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj index 8995c03886..6e9aef2e1f 100644 --- a/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj +++ b/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj @@ -89,7 +89,7 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(OutDir)\compile.exe ..\..\..\..\src\glsl\apps"
+ CommandLine="copy "$(OutDir)\compile.exe" ..\..\..\..\src\glsl\apps"
/>
</Configuration>
<Configuration
@@ -166,7 +166,7 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(OutDir)\compile.exe ..\..\..\..\src\glsl\apps"
+ CommandLine="copy "$(OutDir)\compile.exe" ..\..\..\..\src\glsl\apps"
/>
</Configuration>
</Configurations>
|