ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-16 22:28:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into systemtray

Browse Source
This commit is contained in:
Grant Limberg
2016-11-16 16:23:56 -08:00
parent 6445337a32 3c248ec61a
commit b4bacd50a1
36 changed files with 1781 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
windows/WinUI/NetworkListView.xaml.cs
View File

@ -63,7 +63,7 @@ namespace WinUI
networkId.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
{
this.networkId.Content = status.Address;
this.networkId.Text = status.Address;
}));
versionString.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
{
@ -80,7 +80,7 @@ namespace WinUI
networkId.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
{
this.networkId.Content = "";
this.networkId.Text = "";
}));
versionString.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
{