Skip to content

Commit

Permalink
Merge branch 'hotfix-not_pop_up_C'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiashuo Li committed May 12, 2015
2 parents 514cf9f + ac2c465 commit 2a51a4f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion UI/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<userSettings>
<iRobotGUI.Properties.Settings>
<setting name="OpenCCode" serializeAs="String">
<value>True</value>
<value>False</value>
</setting>
<setting name="EmulatorPath" serializeAs="String">
<value />
Expand Down
2 changes: 1 addition & 1 deletion UI/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UI/Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Profiles />
<Settings>
<Setting Name="OpenCCode" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="EmulatorPath" Type="System.String" Scope="User">
<Value Profile="(Default)" />
Expand Down

0 comments on commit 2a51a4f

Please sign in to comment.