automated merge

meow-7.2.2
Loren Shih 2010-05-11 15:25:52 -04:00
commit d8b96c686d
2 changed files with 2 additions and 7 deletions

View File

@ -296,28 +296,23 @@ RenderUseImpostors 0 0
list Intel_945GM
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
RenderUseImpostors 0 0
list Intel_945G
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
RenderUseImpostors 0 0
list Intel_950
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
RenderUseImpostors 0 0
list Intel_965
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
UseOcclusion 0 0
RenderUseImpostors 0 0
list Intel_G33
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
RenderUseImpostors 0 0
list Intel_G45
WindLightUseAtmosShaders 0 0

View File

@ -20,7 +20,7 @@
<button label="IM" name="im_btn"/>
<button label="プロフィール" name="view_profile_btn"/>
<panel name="moderator_panel">
<button label="ボイスを無効にする" name="disable_voice"/>
<button label="ボイスを有効にする" name="enable_voice"/>
<button label="ボイスを無効" name="disable_voice"/>
<button label="ボイスを有効" name="enable_voice"/>
</panel>
</floater>