Files · c47f3f37ed8e093ea92c8a163aa59aec3d184f89 · zhenfei.zhang / fmPOS

Merge branch 'master' into fmp_ePay · c47f3f37

# Conflicts:
#	.gitignore
#	debug/bin/fmPos.ini
#	fmPos.pro
#	fmp_epay/fmp_epay.cpp
#	fmp_epay/fmp_epay.pro
#	fmp_epay/fmp_epay_p.cpp
#	fmp_epay/fmp_pe_handlers.cpp
#	fmp_epay/fmp_pe_handlers.h
#	fmp_epay/version.h
#	fmp_home/fmp_he_handlers.cpp
#	fmp_home/fmp_home_p.cpp
#	fmp_settings/fmp_settings_def.h
#	fmp_settings/version.h
#	fmp_syncer/version.h

committed Mar 17, 2017

c47f3f37

Name	Last commit	Last update
FreemudPOS		Loading commit data...
FreemudSyncer		Loading commit data...
debug/bin		Loading commit data...
fmp_epay		Loading commit data...
fmp_home		Loading commit data...
fmp_logger		Loading commit data...
fmp_manager		Loading commit data...
fmp_network		Loading commit data...
fmp_settings		Loading commit data...
fmp_syncer		Loading commit data...
include		Loading commit data...
lib		Loading commit data...
release/bin		Loading commit data...
.gitignore		Loading commit data...
fmPos.pro		Loading commit data...
fmpos.suo		Loading commit data...
fmprc.bat		Loading commit data...
pluginrc.h		Loading commit data...
pluginrc.rc		Loading commit data...