--- uae/src/ChangeLog	2018/04/24 17:10:33	1.1.1.23
+++ uae/src/ChangeLog	2018/04/24 17:16:17	1.1.1.26
@@ -1,3 +1,48 @@
+A10805 Implement a way not to block on sound output, using the time for m68k
+       cycles instead.
+       Remove "config.h" and all of its #includes.
+       Merge various audio bits from E-UAE, including sinc interpolation.  Add
+       GUI support for it.
+       Merge random other changes from E-UAE.
+       Revert previous playfield delay changes which broke the RSI demo.
+       When setting picasso mode in xwin and sdlgfx, check whether we keep the
+       same dimensions, and skip the shutdown/init cycle if so.
+       Kill 8 bit audio support.
+A10804 Make fullscreen and windowed graphics configurations independent.
+       Fix some issues with SDL and fullscreen.
+       Move call to InitPicasso out of reset_drawing.
+       Use gettimeofday for the max CPU setting, rather than rdtsc - at least
+       if it is accurate enough.
+A01111 Fixes to compile with gcc-4.1.
+A00707 Imported keymap stuff from euae.
+9F0704 Playfield delay code imported from WinUAE.
+       If produce_sound is 0, kill audio event on state restore.
+9F0702 Deleted really old mousehack (sprite follow) code, since there are a
+       number of better alternatives today and it didn't work so well with
+       the inputdevice stuff.
+       leds_on_screen can be toggled in the GTK UI; hscale widths fixed.
+       Lose 24bit checkbox; use 68EC020 names.  Disable Z3 and P96 memory when
+       using EC CPU.  CPU type settings take effect only after reset.  68000
+       mode is always slow but compatible.
+       Some state save changes merged from WinUAE.
+9F0701 Imported inputdevice code from WinUAE; Linux specific inputdevice code
+       partly from EUAE.  Breaks the autofire stuff I added :-/
+       uae_reset now takes an argument.
+       Imported more romlist code and a few other bits and pieces from WinUAE.
+       Removed memory-smashing remains of AHI.
+9F0629 Adapt autofire logic a little to work better with my new four-button
+       Competition Pro.
+       More small and relatively unimportant differences merged from WinUAE.
+       Delete more fast_copper pieces that escaped the previous purge.
+9F0317 Fix bsdsocket compilation problems.  Include picasso96.h in
+       inputdevice.c.
+9F0211 Add NOINLINE macro.  Turns out gcc-3.3.3 likes to inline large functions
+       but not small ones so we have to mess with noinline and always_inline
+       attributes.  Fish.
+9E1113 Compile with gtk-2.0.
+9E1024 Remove fast copper code.
+       Created inputdevice.c; moved over some code from custom.c.
+       Merge further small pieces from WinUAE.
 9E1011 ALSA sound and SDL sound fix from Heikki Orsila.
 9E1010 Remove AHI code from audio.c; WinUAE didn't end up using it so there's
        no point keeping it around.