moparisthebest
/
keepass2android
mirror of https://github.com/moparisthebest/keepass2android
1
0
Fork 0
Code Issues Releases Wiki Activity
keepass2android/src/java/InputStickAPI
History
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
..
.settings +InputStick plugin 2014-06-01 07:06:58 +02:00
gen/com/inputstick/api more inputstick updates from Jakup 2014-12-10 22:33:27 +01:00
libs Merge branch 'master' of https://git01.codeplex.com/keepass2android into HEAD 2014-12-09 06:22:27 +01:00
res Merge branch 'master' of https://git01.codeplex.com/keepass2android into HEAD 2014-12-09 06:22:27 +01:00
src/com/inputstick Merge branch 'kp2aforsync' 2014-12-12 06:08:11 +01:00
.classpath +InputStick plugin 2014-06-01 07:06:58 +02:00
.project +InputStick plugin 2014-06-01 07:06:58 +02:00
AndroidManifest.xml Merge branch 'master' of https://git01.codeplex.com/keepass2android into HEAD 2014-12-09 06:22:27 +01:00
proguard-project.txt +InputStick plugin 2014-06-01 07:06:58 +02:00
project.properties more inputstick updates from Jakup 2014-12-10 22:33:27 +01:00