modifying f_base.cpp
modifying f_misc.cpp
modifying f_misc.h
modifying stdafx.cpp
modifying aws_soc.h
updating unmerged files
updating unmerged files