uv
uv
uv
uv
uv
	modified:   LPC11Uxx_Test/cappuccino/src/main.c
	modified:   LPC11Uxx_Test/cappuccino/src/sd.c
	modified:   armcmx/lpc11uxx/cappuccino.h
	modified:   armcmx/lpc11uxx/ssp.h
	modified:   armcmx/tools/SDFatFs/SDFatFs.cpp
	modified:   armcmx/tools/SDFatFs/SDFatFs.h
	renamed:    armcmx/tools/SDFatFs/SDFatFs.cpp -> armcmx/tools/SDFatFs/mmc_old/mmc_sd.cpp
	renamed:    armcmx/tools/SDFatFs/mmc_spi.org.c -> armcmx/tools/SDFatFs/mmc_old/mmc_spi.org.c
	modified:   armcmx/tools/SDFatFs/mmc_sd.h
	modified:   armcmx/tools/SDFatFs/mmc_spi.c
	new file:   armcmx/tools/SDFatFs/mmc_ssp.c
	modified:   lpc11uxx_lcd/Keil/LPC11U24LCD.uvproj
	modified:   lpc11uxx_rfid_sdio/src/main.cpp
	modified:   lpc11uxx_rfid_test/Keil/LPC11U24LCDRFID.uvproj
	modified:   lpc11uxx_rfid_test/src/main.cpp
	modified:   lpc11uxx_sd/Keil/lpc11uxx_sd.uvproj
	new file:   lpc11uxx_sd/SDFatFs/diskio.h
	new file:   lpc11uxx_sd/SDFatFs/ff.c
	new file:   lpc11uxx_sd/SDFatFs/ff.h
	new file:   lpc11uxx_sd/SDFatFs/ffconf.h
	new file:   lpc11uxx_sd/SDFatFs/integer.h
	new file:   lpc11uxx_sd/SDFatFs/mmc_ssp.c
	new file:   lpc11uxx_sd/SDFatFs/sd.c
	new file:   lpc11uxx_sd/SDFatFs/sdfatfs.h
	new file:   lpc11uxx_sd/SDFatFs/ssp.c
	new file:   lpc11uxx_sd/SDFatFs/ssp.h
	modified:   lpc11uxx_sd/src/main.cpp
Merge branch 'master' into @workplace

Conflicts:
	lpc11uxx_rfid_sdio/Keil/LPC11U24LCDRFID.uvproj
	lpc11uxx_rfid_test/src/main.cpp