merge到master

Browse Source

...

This commit is contained in:

Haven Mattuy

2018-12-23 15:09:24 +08:00

parent c3d163dfa8

commit bac637213b

35 changed files with 322 additions and 322 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Interact/AttrNames.cs → stormchat-client-csharp/Interact/AttrNames.cs

Interact/Client-Fields.cs → stormchat-client-csharp/Interact/Client-Fields.cs

Interact/Client-Handle.cs → stormchat-client-csharp/Interact/Client-Handle.cs

Interact/Client-Read.cs → stormchat-client-csharp/Interact/Client-Read.cs

Interact/Client-Send.cs → stormchat-client-csharp/Interact/Client-Send.cs

Interact/Client.cs → stormchat-client-csharp/Interact/Client.cs

Interact/Exception.cs → stormchat-client-csharp/Interact/Exception.cs

Interact/Interact.csproj → stormchat-client-csharp/Interact/Interact.csproj

Interact/Message.cs → stormchat-client-csharp/Interact/Message.cs

Interact/Newtonsoft.Json.dll → stormchat-client-csharp/Interact/Newtonsoft.Json.dll

Interact/Properties/AssemblyInfo.cs → stormchat-client-csharp/Interact/Properties/AssemblyInfo.cs

Interact/Properties/Resources.Designer.cs → stormchat-client-csharp/Interact/Properties/Resources.Designer.cs

Generated

Interact/Properties/Resources.resx → stormchat-client-csharp/Interact/Properties/Resources.resx

Interact/User.cs → stormchat-client-csharp/Interact/User.cs

Interact/JsonObject.cs → stormchat-client-csharp/Interact/jsonObject.cs

StormChat.sln → stormchat-client-csharp/StormChat.sln

StormChatWPF/App.config → stormchat-client-csharp/StormChatWPF/App.config

StormChatWPF/App.xaml → stormchat-client-csharp/StormChatWPF/App.xaml

StormChatWPF/App.xaml.cs → stormchat-client-csharp/StormChatWPF/App.xaml.cs

StormChatWPF/Chat.cs → stormchat-client-csharp/StormChatWPF/Chat.cs

StormChatWPF/LogWindow.xaml → stormchat-client-csharp/StormChatWPF/LogWindow.xaml

StormChatWPF/LogWindow.xaml.cs → stormchat-client-csharp/StormChatWPF/LogWindow.xaml.cs

StormChatWPF/MainWindow.xaml → stormchat-client-csharp/StormChatWPF/MainWindow.xaml

StormChatWPF/MainWindow.xaml.cs → stormchat-client-csharp/StormChatWPF/MainWindow.xaml.cs

StormChatWPF/Properties/AssemblyInfo.cs → stormchat-client-csharp/StormChatWPF/Properties/AssemblyInfo.cs

StormChatWPF/Properties/Resources.resx → stormchat-client-csharp/StormChatWPF/Properties/Resources.resx

StormChatWPF/Properties/Settings.Designer.cs → stormchat-client-csharp/StormChatWPF/Properties/Settings.Designer.cs

Generated

StormChatWPF/Properties/Settings.settings → stormchat-client-csharp/StormChatWPF/Properties/Settings.settings

StormChatWPF/Resources/LogFormBackground.jpg → stormchat-client-csharp/StormChatWPF/Resources/LogFormBackground.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 71 KiB After Width:  |  Height:  |  Size: 71 KiB

StormChatWPF/ScrollViewer.cs → stormchat-client-csharp/StormChatWPF/ScrollViewer.cs

StormChatWPF/StormChatWPF.csproj → stormchat-client-csharp/StormChatWPF/StormChatWPF.csproj

StormChatWPF/UI/ChatBubble.cs → stormchat-client-csharp/StormChatWPF/UI/ChatBubble.cs

StormChatWPF/UI/Resources/登录界面底.png → stormchat-client-csharp/StormChatWPF/UI/Resources/登录界面底.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 79 KiB After Width:  |  Height:  |  Size: 79 KiB

StormChatWPF/UI/Resources/聊天气泡.png → stormchat-client-csharp/StormChatWPF/UI/Resources/聊天气泡.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.6 KiB After Width:  |  Height:  |  Size: 4.6 KiB

StormChatWPF/UI/Resources/闪电.png → stormchat-client-csharp/StormChatWPF/UI/Resources/闪电.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 42 KiB After Width:  |  Height:  |  Size: 42 KiB