diff options
author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /mesalib/src/mesa/drivers/dri/common/drirc | |
parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common/drirc')
-rw-r--r-- | mesalib/src/mesa/drivers/dri/common/drirc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/drirc b/mesalib/src/mesa/drivers/dri/common/drirc index cf13cdb80..a13941f68 100644 --- a/mesalib/src/mesa/drivers/dri/common/drirc +++ b/mesalib/src/mesa/drivers/dri/common/drirc @@ -22,5 +22,8 @@ <application name="Unigine OilRush (64-bit)" executable="OilRush_x64"> <option name="disable_blend_func_extended" value="true" /> </application> + <application name="Savage 2" executable="savage2.bin"> + <option name="disable_glsl_line_continuations" value="true" /> + </application> </device> </driconf> |