modified:   data/xl.mdf
Merge branch 'master' of https://github.com/joorhy/jorhy-xl

Conflicts:
	data/xl.mdf
	data/xl_log.ldf

	new file:   libs/server2003/msado15.dll
	modified:   src/TransServer/MsSqlServer.cpp
	modified:   src/TransServer/MsSqlServer.h
	modified:   src/TransServer/XlCType.h
	modified:   src/TransServer/XlClient.cpp
	modified:   src/TransServer/XlDType.h
	modified:   src/TransServer/XlHelper.cpp
	modified:   src/TransServer/XlHost.cpp
	modified:   src/TransServer/XlHost.h
	modified:   src/client_demo/ClientImpl.cpp
	modified:   src/client_demo/VideoDlg.cpp
	modified:   src/client_demo/XlClientType.h
	new file:   "doc/\350\275\254\345\217\221\347\253\257\345\222\214\345\256\242\346\210\267\347\253\257\344\272\244\344\272\222\346\216\245\345\217\243V1.3.doc"
	new file:   "doc/\350\277\205\345\210\251\350\275\246\350\275\275\344\270\273\346\234\272\347\263\273\347\273\237\347\275\221\347\273\234\351\200\232\350\256\257\345\215\217\350\256\256V1.5.doc"