mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-12-01 13:32:27 -05:00
f442a04520
Conflicts: src/Kp2aBusinessLogic/SearchDbHelper.cs src/keepass2android/Database.cs src/keepass2android/EntryActivity.cs src/keepass2android/EntryEditActivity.cs src/keepass2android/icons/DrawableFactory.cs src/keepass2android/search/SearchResults.cs |
||
---|---|---|
.. | ||
database | ||
Properties | ||
Resources | ||
IDrawableFactory.cs | ||
IKp2aApp.cs | ||
KeyFileException.cs | ||
Kp2aBusinessLogic.csproj | ||
PreferenceKey.cs | ||
ProgressTask.cs | ||
PwGroupEqualityFromIdComparer.cs | ||
PwUuidEqualityComparer.cs | ||
SearchDbHelper.cs | ||
UiStringKey.cs | ||
UpdateStatus.cs |