-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
Conflicts: Quyd/Quyd.v12.suo Quyd/Quyd/Bin/Debug/Quyd.dll Quyd/Quyd/Bin/Debug/Quyd.pdb Quyd/Quyd/Bin/Debug/Quyd_Debug_AnyCPU.xap Quyd/Quyd/PivotPage1.xaml.cs Quyd/Quyd/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Quyd/Quyd/obj/Debug/Quyd.dll Quyd/Quyd/obj/Debug/Quyd.pdb Quyd/Quyd/obj/Debug/XapCacheFile.xml
- Loading branch information
Showing
172 changed files
with
9,131 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# git ignore file | ||
/Quyd/Quyd/obj | ||
/Quyd/Quyd/Bin |
Binary file not shown.
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 not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
141 changes: 141 additions & 0 deletions
141
Quyd/Quyd/Bin/Debug/Microsoft.Threading.Tasks.Extensions.Phone.xml
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file not shown.
Oops, something went wrong.