Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
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
Wait committed Jul 8, 2014
2 parents 2bf68cf + 293acb6 commit 2928eba
Show file tree
Hide file tree
Showing 172 changed files with 9,131 additions and 72 deletions.
3 changes: 3 additions & 0 deletions .gitignore
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 added Quyd/Quyd.suo
Binary file not shown.
Binary file added Quyd/Quyd/Bin/Debug/Assets/ApplicationIcon.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 added Quyd/Quyd/Bin/Debug/Facebook.Client.dll
Binary file not shown.
1,333 changes: 1,333 additions & 0 deletions Quyd/Quyd/Bin/Debug/Facebook.Client.xml

Large diffs are not rendered by default.

Binary file added Quyd/Quyd/Bin/Debug/Facebook.dll
Binary file not shown.
1,935 changes: 1,935 additions & 0 deletions Quyd/Quyd/Bin/Debug/Facebook.xml

Large diffs are not rendered by default.

Binary file not shown.
258 changes: 258 additions & 0 deletions Quyd/Quyd/Bin/Debug/Microsoft.Advertising.Mobile.xml

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
141 changes: 141 additions & 0 deletions 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.

Binary file not shown.
Loading

0 comments on commit 2928eba

Please sign in to comment.