Merge branch 'dev' into release

# Conflicts:
#	CMakeLists.txt
#	res/about/help.gmi
#	res/about/version.gmi
#	src/app.c
#	src/ui/documentwidget.c

1 files changed, 1 insertions, 0 deletions

diff --git a/src/ui/window.h b/src/ui/window.h
index 4aec2fa7..b067d30e 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -34,6 +34,7 @@ iDeclareTypeConstructionArgs(Window, iRect rect)
 
 struct Impl_Window {
     SDL_Window *  win;
+    iInt2         initialPos;
     iBool         isDrawFrozen; /* avoids premature draws while restoring window state */
     SDL_Renderer *render;
     iWidget *     root;