qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Branch_1.0.0'

Browse Source 
Conflicts:
	src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
This commit is contained in:
Philipp Crocoll
2016-02-16 11:58:10 +01:00
parent 8b192b4796 0c7c543558
commit 2dcc53c32f
7 changed files with 14 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
View File

@@ -126,6 +126,10 @@
<Compile Include="Utils\Spr\SprEngine.PickChars.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">
<Project>{48574278-4779-4b3a-a9e4-9cf1bc285d0b}</Project>
<Name>JavaFileStorageBindings</Name>
</ProjectReference>
<ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
<Project>{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}</Project>
<Name>KeePassLib2Android</Name>