modified:   PuTTY/putty.h
	deleted:    PuTTY/testback.c
	modified:   PuTTY/windows/winnet.c
	modified:   cfg.def
	modified:   config
	modified:   front/line_discipline.def
	modified:   macro/attr.def
	modified:   temp/windlg.def
	modified:   temp_def/test.def
	modified:   term.def
	modified:   term/alt.def
	modified:   term/compressline.def
	modified:   term/cursor.def
	modified:   term/line.def
	modified:   term/main.def
	modified:   term/misc.def
	modified:   term/paint.def
	modified:   term/scrollback.def
	modified:   term/selection.def
	modified:   term/term_out.def
	modified:   term/to_action.def
	modified:   term/to_beep.def
	modified:   term/to_csi.def
	modified:   term/to_log.def
	modified:   term/to_print.def
	modified:   win.def
	modified:   win32/color.def
	modified:   win32/font.def
	modified:   win32/frontend.def
	modified:   win32/main.def
	modified:   win32/other.def
	modified:   win32/wndproc.def

 Untracked files:
   (use "git add <file>..." to include in what will be committed)
	autoload.def
	backend.def
	macro/bufchain.def
	macro/clist.def
	telnet.def
	win32/error.def
	win32/size.def
	win32/sock.def
	win32/temp.def
	new file:   autoload.def
	new file:   backend.def
	new file:   macro/bufchain.def
	new file:   macro/clist.def
	new file:   telnet.def
	new file:   win32/error.def
	new file:   win32/size.def
	new file:   win32/sock.def
	new file:   win32/temp.def
	modified:   PuTTY/wcwidth.c
	modified:   PuTTY/windows/winucs.c
	modified:   front/line_discipline.def
	modified:   macro/attr.def
	modified:   macro/charset.def
	modified:   term/alt.def
	modified:   term/compressline.def
	modified:   term/cursor.def
	modified:   term/line.def
	modified:   term/main.def
	modified:   term/misc.def
	modified:   term/paint.def
	modified:   term/paste.def
	modified:   term/selection.def
	modified:   term/to_action.def
	modified:   term/to_beep.def
	modified:   unicode.def
	modified:   win.def
	modified:   win32/font.def
	modified:   win32/keyboard.def
	modified:   win32/main.def
	modified:   win32/mouse.def
	modified:   win32/other.def
	modified:   win32/temp.def
	modified:   win32/time.def
	modified:   win32/wndproc.def
	modified:   backend.def
	modified:   front/line_discipline.def
	modified:   macro/bufchain.def
	modified:   macro/clist.def
	deleted:    telnet.def
	modified:   term.def
	modified:   term/alt.def
	modified:   term/cursor.def
	modified:   term/line.def
	modified:   term/main.def
	modified:   term/misc.def
	modified:   term/paint.def
	modified:   term/selection.def
	modified:   term/term_out.def
	modified:   term/to_action.def
	modified:   term/to_csi.def
	modified:   term/to_print.def
	modified:   term/to_utf.def
	modified:   win.def
	modified:   win32/color.def
	modified:   win32/debug.def
	modified:   win32/keyboard.def
	modified:   win32/main.def
	modified:   win32/mouse.def
	modified:   win32/other.def
	modified:   win32/size.def
	modified:   win32/temp.def
	new file:   macro/misc.def
Merge branch 'master' of github.com:hzhou/PuTTY-MyDef

Conflicts:
	term.def

	new file:   telnet.def
	new file:   shell.def
	new file:   term/other.def