Permalink
Browse files

Merge branch 'develop' into advancedapi

  • Loading branch information...
thriqon committed May 8, 2012
2 parents 9f23c40 + c3c0f57 commit bd3fb5eb0388d476b9747b03212ffa506e263cc7
Showing with 7 additions and 7 deletions.
  1. +4 −4 Properties/Settings.Designer.cs
  2. +3 −3 Properties/Settings.settings

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -23,11 +23,11 @@
<Setting Name="ApiVersion" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">3</Value>
</Setting>
- <Setting Name="fmask" Type="System.String" Scope="Application">
- <Value Profile="(Default)">70F8FAC000</Value>
+ <Setting Name="fmask_file" Type="System.String" Scope="Application">
+ <Value Profile="(Default)">70F8CAC000</Value>
</Setting>
<Setting Name="amask_file" Type="System.String" Scope="Application">
- <Value Profile="(Default)">0000F0C0</Value>
+ <Value Profile="(Default)">0000F000</Value>
</Setting>
<Setting Name="amask_anime" Type="System.String" Scope="Application">
<Value Profile="(Default)">92F0E0A0000000</Value>

0 comments on commit bd3fb5e

Please sign in to comment.