chiark - git - ijackson - trains.git/commit

chiark / gitweb /

~ijackson / trains.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: ed02416) | patch

author	ian <ian>
	Sun, 4 Dec 2005 21:53:05 +0000 (21:53 +0000)
committer	ian <ian>
	Sun, 4 Dec 2005 21:53:05 +0000 (21:53 +0000)
commit	9a89c6f3201ed4733bc3eaa74718afa54ae09a29
tree	cee6e2712be045676cdea3c95818949a438183f9	tree \| snapshot
parent	ed024161cc12114f40e03c56c21a0cb3aba58af8	commit \| diff

improved mergehex detect clashes

cebpic/intelhex.pdf	[new file with mode: 0644]	blob
cebpic/manypics.make		diff \| blob \| history
cebpic/merge-hex		diff \| blob \| history
detpic/Makefile		diff \| blob \| history
detpic/pindata.inc		diff \| blob \| history
iwjpictest/Makefile		diff \| blob \| history
pic.make		diff \| blob \| history

Unnamed repository; edit this file to name it for gitweb.