1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Commit graph

13 commits

Author SHA1 Message Date
Nikolay Pultsin
31e75b7b2d new background preference (in progress) + tips are back 2014-08-26 04:13:04 +04:00
Nikolay Pultsin
f5df3fd3aa pathArray => pathList 2014-05-03 14:18:25 +01:00
Nikolay Pultsin
3af51e5348 Merge branch 'master' into dm
Conflicts:
	src/org/geometerplus/android/util/FileChooserUtil.java
2014-05-03 14:16:13 +01:00
Nikolay Pultsin
412db9748c FileChooserUtil.runFolderListDialog() 2014-05-03 14:12:34 +01:00
Nikolay Pultsin
01500511e5 renaming 2014-05-03 14:09:54 +01:00
Nikolay Pultsin
15550abb7e synchronization with dm branch 2014-05-03 14:05:58 +01:00
Nikolay Pultsin
48d46ae7f3 code cleanup 2014-05-03 14:04:21 +01:00
Nikolay Pultsin
7c15fe932c Merge branch 'master' into dm
Conflicts:
	src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
	src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
2014-05-03 03:44:50 +01:00
Nikolay Pultsin
64df151fe6 formatting 2014-05-03 02:52:40 +01:00
Dmitri Yuranov
29e9ef3cb4 Update 2014-04-27 12:07:33 +02:00
Dmitri Yuranov
2db6151b21 Directories manager, draft 2014-04-27 12:06:58 +02:00
Dmitry Yuranov
4794423739 Init the dirmanager activity
Conflicts:
	AndroidManifest.xml
2014-04-27 12:06:35 +02:00
Nikolay Pultsin
64de74460d file chooser used in FixBooksDirectoryActivity 2014-04-17 22:08:24 +01:00