--- gigedit/trunk/ChangeLog	2017/06/22 10:54:10	3286
+++ gigedit/trunk/ChangeLog	2018/01/03 13:29:55	3403
@@ -1,4 +1,11 @@
-Version SVN HEAD (?)
+Version SVN trunk (?)
+
+  * Script Editor: Fixed some minor issues with vertical line number bar
+    (which was editable, selectable and incorrectly displayed on new scripts).
+  * Translation Fix: MacroEditor.cpp and MacrosSetup.cpp were not under
+    translation control.
+
+Version 1.1.0 (2017-11-25)
 
   * allow building with G/GDK/GTK_DISABLE_DEPRECATED
   * fixed building without linuxsampler on Mac
@@ -108,6 +115,49 @@
   * Script Editor: only if compiled without liblinuxsampler; added support for
     new NKSP language keyword "synchronized".
   * Script Editor: strike through code blocks filtered out by the preprocessor.
+  * Combine Tool: Show instruments' index number in the list view.
+  * Combine Tool: Now it allows to select the instruments to be combined
+    already in the main window's instruments list view; then either call the
+    combine instrument dialog from the main menu or use the new keyboard
+    shortcut Ctrl + j.
+  * Combine Tool: Added a vertical list which represents the order of the
+    selected instruments to be combined; dragging them modifies their order.
+  * Combine Tool: After returning from the combine tool dialog, automatically
+    scroll to the newly added (combined) instrument.
+  * Draw icons on individual dimension region zones, similar to the icons
+    already been drawn on regions.
+  * Fixed loop and sample reference icons being displayed incorrectly sometimes,
+    because unused dimension regions were not ignored.
+  * Script Editor: Show line numbers.
+  * Script Editor: Right aligned line numbers.
+  * Script Editor: Fixed font readability issue on Mac.
+  * Added EG state machine options for EG1 and EG2, which may be used to
+    configure whether the individual EG stages may be cancelled.
+  * Fix: after the combine instruments dialog, the new instrument was not
+    correctly displayed by the GUI as being selected.
+  * Fix: automatically reload instrument after script slots have been modified.
+  * Combine Tool: OK button has focus now by default to quickly combine
+    instruments by pressing Return key.
+  * Added keyboard accelerators Shift+F1 to Shift+F12 for quick assigning
+    a script to the currently selected instrument, and an appropriate
+    additional menu "Instruments" -> "Assign Script".
+  * Added keyboard accelerators Ctrl + Arrow Down and Ctrl + Arrow Up for
+    switching between instruments.
+  * Added search filter field which allows to quickly filter the instrument
+    list by case insensitive search tokens.
+  * Fix: navigating between dimension zones by keyboard did sometimes not
+    work after switching from an instrument with different dimension types.
+  * Fix: Sample references view dialog had some odd behaviors, like it did not
+    respond to mouse scroll events for instance.
+  * Debian: Raised Debian compatibility level to Debian 9 "Stretch".
+  * Raised max. pitchbend range to 48 semi tones.
+  * Added experimental support for upcoming GTK(MM)4
+    (for now up to GTKMM 3.91.2 while still preserving backward compatibility
+    down to GTKMM 2).
+  * Re-merged r2845 to compile now with and without Gtk "Stock ID" API
+    (see also r3158).
+  * Visual cosmetics on Gtk 3.
+  * Script Editor: Use consistent font size on all screens and DPI settings.
 
 Version 1.0.0 (2015-07-17)