Philipp Crocoll 26686ed8a7 Merge branch 'master' of https://git01.codeplex.com/forks/wlawski/keepass2android into wlawski ... Conflicts: .gitignore src/java/InputStickAPI/gen/com/inputstick/api/R.java src/java/PluginInputStick/gen/com/inputstick/api/R.java src/java/PluginInputStick/gen/keepass2android/plugin/inputstick/R.java src/java/PluginInputStick/gen/keepass2android/pluginsdk/R.java src/keepass2android/Resources/Resource.designer.cs		2014-12-14 07:29:29 +01:00
..
java	Merge branch 'master' of https://git01.codeplex.com/forks/wlawski/keepass2android into wlawski	2014-12-14 07:29:29 +01:00
native	added Gingerbread keyboard from AOSP with several modifications like new workspace, reorganized native code, removal of dictionaries and voice (to reduce permissions)	2014-01-09 05:42:28 +01:00
.gitignore	added Gingerbread keyboard from AOSP with several modifications like new workspace, reorganized native code, removal of dictionaries and voice (to reduce permissions)	2014-01-09 05:42:28 +01:00