Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
FrayxRulez committed Feb 28, 2018
2 parents 006e00c + 4812305 commit 0fe8dfa
Show file tree
Hide file tree
Showing 1,972 changed files with 58,236 additions and 151,459 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,4 @@ _Pvt_Extensions
/Unigram/Telegram.Api.Native.Test/Assets/GIFs
/Unigram/Unigram/Microsoft.UI.Xaml/Libraries/ARM
/Unigram/Telegram.Api.Native/Telegram.Api.Native_p.h
/Unigram/Libraries/Template10-version_1.1.12_vs2017
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ The following tools and SDKs are mandatory for the project development:
* NuGet package manager
* Universal Windows Platform tools
* Windows 10 SDK 16299

[Can I use Visual Studio 2015?](https://github.com/UnigramDev/Unigram/wiki/FAQ:-Development#why-do-i-have-to-use-visual-studio-2017-cant-i-use-vs2015)
* TDLib for Universal Windows Platform

## Dependencies
The app uses the following NuGet packages to work:
Expand All @@ -57,13 +56,11 @@ The app uses the following NuGet packages to work:
* [Microsoft.NETCore.UniversalWindowsPlatform](https://www.nuget.org/packages/Microsoft.NETCore.UniversalWindowsPlatform/)
* [Microsoft.Xaml.Behaviors.Uwp.Managed](https://www.nuget.org/packages/Microsoft.Xaml.Behaviors.Uwp.Managed/)
* [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/)
* [Portable.BouncyCastle](https://www.nuget.org/packages/Portable.BouncyCastle/)
* [System.Reactive](https://www.nuget.org/packages/System.Reactive/)
* [Template10](https://www.nuget.org/packages/Template10/)
* [Universal.WinSQLite](https://www.nuget.org/packages/Universal.WinSQLite/)
* [Win2D.uwp](https://www.nuget.org/packages/Win2D.uwp/)

The project also relies on `libogg`, `libopus`, `libopusfile` and `libwebp` that are included in the repository.
The project also relies on `libogg`, `libopus`, `libopusfile`, `libwebp` and `libtgvoip` that are included in the repository.

## Current and planned features
Check out the [Features list](https://github.com/UnigramDev/Unigram/wiki/Features) and see what Unigram has to offer and what is yet to come.
Expand Down
Binary file modified Unigram/Assets/Square44x44Logo/Debug/Square44x44Logo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/Square44x44Logo/Debug/Square44x44Logo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/Square44x44Logo/Debug/Square44x44Logo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/Square44x44Logo/Debug/Square44x44Logo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/Square44x44Logo/Debug/Square44x44Logo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Debug/StoreLogo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Debug/StoreLogo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Debug/StoreLogo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Debug/StoreLogo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Debug/StoreLogo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Release/StoreLogo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Release/StoreLogo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Release/StoreLogo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Release/StoreLogo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Unigram/Assets/StoreLogo/Release/StoreLogo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
281 changes: 0 additions & 281 deletions Unigram/Telegram.Api.Native/AtomicFlag.h

This file was deleted.

Loading

0 comments on commit 0fe8dfa

Please sign in to comment.