370c937578
Conflicts: src/KeePassLib2Android/Serialization/IOConnection.cs src/Kp2aBusinessLogic/IKp2aApp.cs src/Kp2aBusinessLogic/database/Database.cs src/keepass2android/Resources/Resource.designer.cs src/keepass2android/app/App.cs src/keepass2android/fileselect/FileSelectActivity.cs
126 lines
3.9 KiB
Plaintext
126 lines
3.9 KiB
Plaintext
PCtest
|
|
|
|
*.suo
|
|
*.userprefs
|
|
*.user
|
|
|
|
*.designer.cs
|
|
|
|
src/java/kp2akeytransform/kp2akeytransform.zip
|
|
|
|
src/Kp2aKeyboardBinding/bin
|
|
src/Kp2aKeyboardBinding/obj
|
|
|
|
src/kp2akeytransform/bin
|
|
src/kp2akeytransform/obj
|
|
|
|
src/Kp2aBusinessLogic/bin
|
|
src/Kp2aBusinessLogic/obj
|
|
|
|
src/Kp2aUnitTests/bin
|
|
src/Kp2aUnitTests/obj
|
|
|
|
src/monodroid-unittesting/MonoDroidUnitTesting/bin
|
|
src/monodroid-unittesting/MonoDroidUnitTesting/obj
|
|
|
|
/src/keepass2android/todos.cs
|
|
/src/keepass2android/obj
|
|
/src/keepass2android/bin
|
|
/src/KeePassLib2Android/bin
|
|
/src/KeePass.userprefs
|
|
/src/keepass2android/Properties/AndroidManifest.xml
|
|
|
|
/src/java/kbbridge/bin/AndroidManifest.xml
|
|
/src/java/kbbridge/bin/R.txt
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/BuildConfig.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/KeyboardData.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/KeyboardDataBuilder.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/R$attr.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/R$drawable.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/R$string.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/R$style.class
|
|
/src/java/kbbridge/bin/classes/keepass2android/kbbridge/R.class
|
|
/src/java/kbbridge/bin/kp2asoftkeyboardbridge.jar
|
|
/src/java/kbbridge/bin/res/drawable-hdpi/ic_launcher.png
|
|
/src/java/kbbridge/bin/res/drawable-mdpi/ic_launcher.png
|
|
/src/java/kbbridge/bin/res/drawable-xhdpi/ic_launcher.png
|
|
|
|
/src/java/kbbridge/libs/android-support-v4.jar
|
|
/src/java/KP2ASoftKeyboard/bin
|
|
/src/java/KP2ASoftKeyboard/gen
|
|
/src/java/KP2ASoftKeyboard/projectzip
|
|
/src/java/KP2ASoftKeyboard/createProjectZip.bat
|
|
Thumbs.db
|
|
|
|
/src/monodroid-unittesting/*.suo
|
|
/src/Kp2aUnitTests/TestLoadDbCredentials.cs
|
|
/src/KP2AKeyboard/bin/Debug/*.dll
|
|
/src/KP2AKeyboard/bin/Debug/KP2AKeyboard.pdb
|
|
/src/KP2AKeyboard/obj/Debug/KP2AKeyboard.csproj.FileListAbsolute.txt
|
|
/src/KP2AKeyboard/obj/Debug/KP2AKeyboard.dll
|
|
/src/KP2AKeyboard/obj/Debug/KP2AKeyboard.pdb
|
|
/src/KP2AKeyboard/obj/Debug/__AndroidLibraryProjects__.zip
|
|
/src/KP2AKeyboard/obj/Debug/library_project_imports/res/values/strings.xml
|
|
/src/KeePass.sln.DotSettings.user
|
|
/src/KeePass.v11.suo
|
|
|
|
/src/KP2AKeyboard/bin/Debug/KP2AKeyboard.dll.mdb
|
|
/src/Kp2aBusinessLogic/bin/Debug
|
|
|
|
/src/Kp2aBusinessLogic/bin/Release
|
|
|
|
/src/Kp2aBusinessLogic/bin/ReleaseNoNet
|
|
|
|
/src/Kp2aBusinessLogic/obj/Debug
|
|
/src/Kp2aBusinessLogic/obj/Release
|
|
|
|
/src/Kp2aBusinessLogic/obj/ReleaseNoNet
|
|
/src/Kp2aKeyboardBinding/bin/Debug
|
|
|
|
/src/Kp2aKeyboardBinding/bin/Release
|
|
|
|
/src/Kp2aKeyboardBinding/bin/ReleaseNoNet
|
|
/src/Kp2aKeyboardBinding/obj/Debug
|
|
|
|
/src/Kp2aKeyboardBinding/obj/Release
|
|
/src/Kp2aKeyboardBinding/obj/ReleaseNoNet
|
|
/src/Kp2aUnitTests/Assets/AboutAssets.txt
|
|
/src/Kp2aUnitTests/bin/Debug
|
|
/src/Kp2aUnitTests/bin/Release
|
|
/src/Kp2aUnitTests/obj/Debug
|
|
/src/Kp2aUnitTests/obj/Release
|
|
/src/Kp2aUnitTests/obj/ReleaseNoNet
|
|
/src/java/KP2ASoftKeyboard/project.zip.tmp
|
|
/src/java/workspace/.metadata
|
|
/src/java/workspace/KP2AKeyboardTest/bin
|
|
/src/java/workspace/KP2AKeyboardTest
|
|
/src/keepass2android/*.user
|
|
/src/kp2akeytransform/bin/Debug
|
|
/src/kp2akeytransform/bin/Release
|
|
|
|
/src/kp2akeytransform/bin/ReleaseNoNet
|
|
/src/kp2akeytransform/obj/ReleaseNoNet
|
|
/src/KP2AKeyboard/bin
|
|
/src/KP2AKeyboard/obj
|
|
/src/Kp2aKeyboardBinding/obj
|
|
/src/Kp2aKeyboardBinding/bin
|
|
/src/kp2akeytransform/obj/Debug
|
|
/src/kp2akeytransform/obj/Release
|
|
/src/monodroid-unittesting/TestTests
|
|
/src/monodroid-unittesting/MonoDroidUnitTestingExample
|
|
/src/monodroid-unittesting/MonoDroidUnitTesting/obj/Release
|
|
/src/monodroid-unittesting/MonoDroidUnitTesting/bin/Debug
|
|
/src/monodroid-unittesting/MonoDroidUnitTesting/obj/Debug
|
|
/src/monodroid-unittesting/MonoDroidUnitTesting/bin/Release
|
|
/src/monodroid-unittesting/MonoDroidUnitTesting/obj/ReleaseNoNet
|
|
|
|
/src/monodroid-unittesting
|
|
|
|
/src/kp2akeytransform/Jars/*.jar
|
|
|
|
/src/java/KP2ASoftKeyboard/.settings
|
|
|
|
/src/java/kp2akeytransform/.settings
|
|
/src/Kp2aUnitTests/bin/ReleaseNoNet/Jars
|
|
/src/Kp2aUnitTests/bin/ReleaseNoNet
|