Merge branch 'work/v1.6' into work/serious-unicode

# Conflicts:
#	res/fonts/SmolEmoji-Regular.ttf

1 files changed, 2 insertions, 0 deletions

diff --git a/src/app.h b/src/app.h
index 918cd396..5d1d42e1 100644
--- a/src/app.h
+++ b/src/app.h
@@ -86,6 +86,7 @@ uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 iBool               isLandscape_App     (void);
 iLocalDef iBool     isPortrait_App      (void) { return !isLandscape_App(); }
 enum iAppDeviceType deviceType_App      (void);
+iLocalDef iBool     isPortraitPhone_App (void) { return isPortrait_App() && deviceType_App() == phone_AppDeviceType; }
 iGmCerts *          certs_App           (void);
 iVisited *          visited_App         (void);
 iBookmarks *        bookmarks_App       (void);
@@ -96,6 +97,7 @@ iObjectList *       listDocuments_App   (const iRoot *rootOrNull); /* NULL for a
 iStringSet *        listOpenURLs_App    (void); /* all tabs */
 iDocumentWidget *   newTab_App          (const iDocumentWidget *duplicateOf, iBool switchToNew);
 void                trimCache_App       (void);
+void                trimMemory_App      (void);
 
 iDocumentWidget *   document_Root       (iRoot *);