git merge trunk

author Masaki Muranaka <monaka at monami-software.com>

Fri, 17 Jul 2009 05:17:02 +0000 (14:17 +0900)

committer Masaki Muranaka <monaka at monami-software.com>

Fri, 17 Jul 2009 05:17:02 +0000 (14:17 +0900)
author Masaki Muranaka <monaka at monami-software.com>
Fri, 17 Jul 2009 05:17:02 +0000 (14:17 +0900)
committer Masaki Muranaka <monaka at monami-software.com>
Fri, 17 Jul 2009 05:17:02 +0000 (14:17 +0900)
diff --cc jtag/configure.ac
Simple merge
diff --cc jtag/src/flash/amd.c
Simple merge
diff --cc jtag/src/flash/amd_flash.c
Simple merge
diff --cc jtag/src/flash/flash.c
Simple merge
author	Masaki Muranaka <monaka at monami-software.com>
	Fri, 17 Jul 2009 05:17:02 +0000 (14:17 +0900)
committer	Masaki Muranaka <monaka at monami-software.com>
	Fri, 17 Jul 2009 05:17:02 +0000 (14:17 +0900)
		1	2
jtag/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
jtag/src/flash/amd.c	patch \|	diff1 \|	diff2 \|	blob \| history
jtag/src/flash/amd_flash.c	patch \|	diff1 \|	diff2 \|	blob \| history
jtag/src/flash/flash.c	patch \|	diff1 \|	diff2 \|	blob \| history