Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dev-release-6.0.0.1 #1995

Merged
merged 10 commits into from
Aug 2, 2019
Merged

dev-release-6.0.0.1 #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7234f2e
change line endings
yuhongherald Jul 24, 2019
a9fa575
Merge remote-tracking branch 'upstream/dev-release' into dev-release
yuhongherald Jul 24, 2019
9839670
Merge remote-tracking branch 'upstream/dev-release' into dev-release
yuhongherald Jul 24, 2019
5f4edbd
Merge branch 'dev-release' of https://github.com/PowerPointLabs/Power…
yuhongherald Jul 29, 2019
4391a20
Merge remote-tracking branch 'upstream/dev-release' into dev-release
yuhongherald Jul 31, 2019
7e983c0
Merge remote-tracking branch 'upstream/dev-release' into dev-release
yuhongherald Jul 31, 2019
9be347d
Merge remote-tracking branch 'upstream/dev-release' into dev-release
yuhongherald Jul 31, 2019
367ebc4
change line endings
yuhongherald Aug 2, 2019
5c2e6fd
Merge remote-tracking branch 'upstream/dev-release' into dev-release
yuhongherald Aug 2, 2019
40b316a
update dev release
yuhongherald Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion PowerPointLabs/PowerPointLabs/PowerPointLabs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<PublishUrl>C:\publish_online\</PublishUrl>
<InstallUrl>https://www.comp.nus.edu.sg/~pptlabs/download/dev/</InstallUrl>
<TargetCulture>en</TargetCulture>
<ApplicationVersion>6.0.0.0</ApplicationVersion>
<ApplicationVersion>6.0.0.1</ApplicationVersion>
<AutoIncrementApplicationRevision>false</AutoIncrementApplicationRevision>
<UpdateEnabled>true</UpdateEnabled>
<UpdateInterval>0</UpdateInterval>
Expand Down
4 changes: 2 additions & 2 deletions PowerPointLabs/PowerPointLabs/Properties/Settings.Designer.cs
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions PowerPointLabs/PowerPointLabs/Properties/Settings.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<Value Profile="(Default)">https://www.comp.nus.edu.sg/~pptlabs/download/dev/</Value>
</Setting>
<Setting Name="Version" Type="System.String" Scope="Application">
<Value Profile="(Default)">6.0.0.0</Value>
<Value Profile="(Default)">6.0.0.1</Value>
</Setting>
<Setting Name="ReleaseDate" Type="System.String" Scope="Application">
<Value Profile="(Default)">31 July 2019</Value>
<Value Profile="(Default)">2 August 2019</Value>
</Setting>
</Settings>
</SettingsFile>
6 changes: 3 additions & 3 deletions PowerPointLabs/PowerPointLabs/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="PowerPointLabs.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
</configSections>
<applicationSettings>
<PowerPointLabs.Properties.Settings>
<setting name="ReleaseType" serializeAs="String">
Expand All @@ -20,10 +20,10 @@
<value>https://www.comp.nus.edu.sg/~pptlabs/download/dev/</value>
</setting>
<setting name="Version" serializeAs="String">
<value>6.0.0.0</value>
<value>6.0.0.1</value>
</setting>
<setting name="ReleaseDate" serializeAs="String">
<value>31 July 2019</value>
<value>2 August 2019</value>
</setting>
</PowerPointLabs.Properties.Settings>
</applicationSettings>
Expand Down