open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget
mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
2014-07-06 02:24:34 +02:00
..
Editor.java Change license from ASLv2 to GPLv3 where possible 2014-04-08 11:59:35 +02:00
EncryptKeyCompletionView.java Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
FixedListView.java Edit key: adding user ids 2014-07-02 15:10:50 +02:00
FoldableLinearLayout.java Converted all other buttons 2014-06-30 19:09:13 +02:00
IntegerListPreference.java
KeyEditor.java Converted all other buttons 2014-06-30 19:09:13 +02:00
KeyServerEditor.java Converted all other buttons 2014-06-30 19:09:13 +02:00
NoSwipeWrapContentViewPager.java Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
SectionView.java Edit key: adding user ids 2014-07-02 15:10:50 +02:00
SlidingTabLayout.java Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
SlidingTabStrip.java Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
UserIdEditor.java Merge branch 'master' of https://github.com/open-keychain/open-keychain 2014-06-30 19:09:56 +02:00