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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64ba1c1d..47cd2442 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,14 +18,14 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.5.2
+    VERSION 1.6.0
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
 set (COPYRIGHT_YEAR 2021)
 if (IOS)
     set (PROJECT_VERSION 1.4)  # pinned for TestFlight
-    set (IOS_BUNDLE_VERSION 8) # just increment this
+    set (IOS_BUNDLE_VERSION 21.6.15)
 endif ()
 
 # Build configuration.
@@ -126,6 +126,8 @@ set (SOURCES
     src/gmdocument.h
     src/gmrequest.c
     src/gmrequest.h
+    src/gmtypesetter.c
+    src/gmtypesetter.h
     src/gmutil.c
     src/gmutil.h
     src/gopher.c