none
change in thinkpad
Merge branch 'master' of https://github.com/jackeyjiang/STM32_DGUS

Conflicts:
	STM32_Demo/projects/test/mdk/lcd_test.uvopt
	STM32_Demo/projects/test/mdk/lcd_test_lcd_test.dep