Merge branch '2.6' into 2.6-kindle

Browse source

...

This commit is contained in:

Nikolay Pultsin 2015-09-29 15:59:07 +01:00

parent a9fc15681b 9295e6fd52

commit 1354a3c689

665 changed files with 1 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

src/android/patches/JellyBeanSpanFixTextView.java → fbreader/app/src/main/java/android/patches/JellyBeanSpanFixTextView.java

Unescape Escape View file

0

src/com/paragon/dictionary/fbreader/OpenDictionaryActivity.java → fbreader/app/src/main/java/com/paragon/dictionary/fbreader/OpenDictionaryActivity.java

Unescape Escape View file

0

src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java → fbreader/app/src/main/java/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java

Unescape Escape View file

0

src/com/yotadevices/fbreader/FBReaderYotaService.java → fbreader/app/src/main/java/com/yotadevices/fbreader/FBReaderYotaService.java

Unescape Escape View file

0

src/org/amse/ys/zip/Decompressor.java → fbreader/app/src/main/java/org/amse/ys/zip/Decompressor.java

Unescape Escape View file

0

src/org/amse/ys/zip/DeflatingDecompressor.java → fbreader/app/src/main/java/org/amse/ys/zip/DeflatingDecompressor.java

Unescape Escape View file

0

src/org/amse/ys/zip/LocalFileHeader.java → fbreader/app/src/main/java/org/amse/ys/zip/LocalFileHeader.java

Unescape Escape View file

0

src/org/amse/ys/zip/MyBufferedInputStream.java → fbreader/app/src/main/java/org/amse/ys/zip/MyBufferedInputStream.java

Unescape Escape View file

0

src/org/amse/ys/zip/NoCompressionDecompressor.java → fbreader/app/src/main/java/org/amse/ys/zip/NoCompressionDecompressor.java

Unescape Escape View file

0

src/org/amse/ys/zip/ZipException.java → fbreader/app/src/main/java/org/amse/ys/zip/ZipException.java

Unescape Escape View file

0

src/org/amse/ys/zip/ZipFile.java → fbreader/app/src/main/java/org/amse/ys/zip/ZipFile.java

Unescape Escape View file

0

src/org/amse/ys/zip/ZipInputStream.java → fbreader/app/src/main/java/org/amse/ys/zip/ZipInputStream.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/AppNotifier.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/AppNotifier.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/CancelActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/CancelActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/DeviceUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/DeviceUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/DisplayBookPopupAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/DisplayBookPopupAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ExternalFileOpener.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ExternalFileOpener.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/FBAndroidAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBAndroidAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/FBReader.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReader.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/FBReaderApplication.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderApplication.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/FBReaderMainActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderMainActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/FBReaderUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReaderUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/FBUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/HideToastAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/HideToastAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/InstallPluginsAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/InstallPluginsAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/MenuData.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/MenuData.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/NavigationPopup.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/NavigationPopup.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/NavigationWindow.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/NavigationWindow.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/NotificationUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/NotificationUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/OpenVideoAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/OpenVideoAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/OpenWebHelpAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/OpenWebHelpAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/OrientationUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/OrientationUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/PluginListActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/PluginListActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/PopupPanel.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/PopupPanel.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/RunPluginAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/RunPluginAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SearchAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SearchAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionBookmarkAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionCopyAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionCopyAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionHidePanelAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionHidePanelAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionPopup.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionPopup.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionShareAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionShareAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionShowPanelAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionShowPanelAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SelectionTranslateAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionTranslateAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SetOrientationAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SetOrientationAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShareBookAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShareBookAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowBookInfoAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookInfoAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowBookmarksAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookmarksAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowCancelMenuAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowCancelMenuAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowLibraryAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowLibraryAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowPreferencesAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowPreferencesAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ShowTOCAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowTOCAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SimplePopupWindow.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SimplePopupWindow.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/StartScreenAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/StartScreenAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/SwitchProfileAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/SwitchProfileAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/TOCActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/TOCActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/TextSearchPopup.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/TextSearchPopup.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ToggleBarsAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ToggleBarsAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/YotaSwitchScreenAction.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/YotaSwitchScreenAction.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/ZLTreeAdapter.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/ZLTreeAdapter.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/Api.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/Api.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiClientImplementation.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiClientImplementation.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiException.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiException.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiInterface.aidl → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiInterface.aidl

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiListener.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiListener.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiMethods.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiMethods.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiObject.aidl → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiObject.aidl

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiObject.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiObject.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiServerImplementation.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/ApiService.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/ApiService.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/FBReaderIntents.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/FBReaderIntents.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/MenuNode.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/MenuNode.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/PluginApi.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/PluginApi.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/TextPosition.aidl → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/TextPosition.aidl

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/api/TextPosition.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/api/TextPosition.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/bookmark/BookmarksUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/config/ConfigInterface.aidl → fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigInterface.aidl

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/config/ConfigService.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigService.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/config/ConfigShadow.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/ConfigShadow.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/config/SQLiteConfig.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/config/SQLiteConfig.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/covers/CoverCache.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverCache.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/covers/CoverHolder.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverHolder.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/covers/CoverManager.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/covers/CoverManager.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/crash/FixBooksDirectoryActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/ColorDict.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/ColorDict.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/Dictan.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/Dictan.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/DictionaryNotInstalledActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/DictionaryNotInstalledActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/DictionaryUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/InternalUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/InternalUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/Lingvo.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/Lingvo.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/dict/OpenDictionary.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/dict/OpenDictionary.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/formatPlugin/CoverReader.aidl → fbreader/app/src/main/java/org/geometerplus/android/fbreader/formatPlugin/CoverReader.aidl

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/formatPlugin/PluginUtil.java → fbreader/app/src/main/java/org/geometerplus/android/fbreader/formatPlugin/PluginUtil.java

Unescape Escape View file

0

src/org/geometerplus/android/fbreader/httpd/DataInterface.aidl → fbreader/app/src/main/java/org/geometerplus/android/fbreader/httpd/DataInterface.aidl

Unescape Escape View file

Some files were not shown because too many files have changed in this diff Show more