Merge branch 'v4.7.x' into master
authorArun Persaud <arun@nubati.net>
Sun, 5 Jan 2014 18:51:08 +0000 (10:51 -0800)
committerArun Persaud <arun@nubati.net>
Sun, 5 Jan 2014 18:51:08 +0000 (10:51 -0800)
commite6e38912837a4fe2464356408d10dee950b3121c
treecb7371c77d4e25422583e0348a7f50603f215029
parent829031aa78f85ced458ab253cdae852e01c751f2
parent904e6bd26188be8089a74ad9196bc5c2b9479530
Merge branch 'v4.7.x' into master

Conflicts:
dialogs.c
gtk/xboard.c
gtk/xoptions.c
po/es.po
winboard/config.h
winboard/winboard.c
31 files changed:
args.h
backend.c
backend.h
board.c
common.h
configure.ac
dialogs.c
draw.c
frontend.h
gamelist.c
gtk/xboard.c
gtk/xoptions.c
menus.c
moves.c
moves.h
nengineoutput.c
parser.c
po/ru.po
usounds.c
usystem.c
winboard/defaults.h
winboard/wclipbrd.c
winboard/wedittags.c
winboard/winboard.c
winboard/winboard.rc
winboard/woptions.c
winboard/wsettings.c
xaw/xboard.c
xaw/xengineoutput.c
xaw/xoptions.c
xboard2.h