master updated (0956a65 -> dafc87e)

[Jimmy Aguilar Mena]

ergus pushed a change to branch master.

      from  0956a65   Make shr scale images on all frames
       new  8ae2a3a   Fix inherited :extend attribute in faces.
       new  e0bcc25   Fix extend face in gui interfaces.
       new  dafc87e   Optimize conditional recursive merge face.


Summary of changes:
 src/xdisp.c  | 30 +++++++++++-------------
 src/xfaces.c | 76 ++++++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 65 insertions(+), 41 deletions(-)