Skip to content
This repository has been archived by the owner on Jan 14, 2022. It is now read-only.

Commit

Permalink
Merge with develop
Browse files Browse the repository at this point in the history
  • Loading branch information
achocron committed Sep 6, 2017
1 parent a90a3bc commit 2a3489b
Show file tree
Hide file tree
Showing 6 changed files with 819 additions and 401 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -273,5 +273,8 @@ externals/
# Output directory
output/

# Archives directory
archives/

#google-services
google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
<AndroidSupportedAbis>arm64-v8a;armeabi;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand Down Expand Up @@ -215,10 +214,10 @@
<ProguardConfiguration Include="proguard.cfg" />
</ItemGroup>
<ItemGroup>
<GoogleServicesJson Include="google-services.json" />
<AndroidEnvironment Include="AndroidEnvironment.cfg" />
</ItemGroup>
<ItemGroup>
<AndroidEnvironment Include="AndroidEnvironment.cfg" />
<GoogleServicesJson Include="google-services.json" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
Expand Down
Loading

0 comments on commit 2a3489b

Please sign in to comment.