modified:   compile/macro.def
	modified:   compileutil.def
	modified:   deflib/DefParser/input_buffer.def
	modified:   deflib/c_tempstr.def
	modified:   deflib/std_perl.def
	modified:   deflib/std_win32.def
	modified:   macros_c/types.def
	modified:   output_c.def
	new file:   deflib/DefParser/skipmake
	new file:   deflib/win32_clipboard.def
	new file:   deflib/win32_gdi.def
	new file:   deflib/win32_timer.def
Merge branch 'master' of github.com:hzhou/MyDef

Conflicts:
	deflib/DefParser/input_buffer.def

	modified:   deflib/DefParser/input_buffer.def
	modified:   deflib/DefParser/lex.def
	modified:   deflib/c_hash.def
	modified:   macros_c/parsing.def