chiark - git - ijackson - trains.git/commit

author	ian <ian>
	Fri, 25 Jan 2008 22:19:00 +0000 (22:19 +0000)
committer	ian <ian>
	Fri, 25 Jan 2008 22:19:00 +0000 (22:19 +0000)
commit	ab8ad1e1a6364dd0b11a2f8f636182f748f60227
tree	b505d55f1d6e277bc67e11e265315e9f4066e2e0	tree \| snapshot
parent	94ef19eab00605c024a6833b9406d639c5874b94	commit \| diff

merge changes from trunk into our branch; cvs up -j branchpoint-hostside-wip-2006-05-06 -j branchend-hostside-wip-2006-05-06; discarded changes: NOPOINT (trunk has 500ms delay before turning CDU off instead) and startwait (trunk has stf_waiting instead)

66 files changed:

TODO		diff \| blob \| history
cebpic/README.protocol		diff \| blob \| history
cebpic/morse-generator		diff \| blob \| history
cprogs.make		diff \| blob \| history
detpic/Makefile		diff \| blob \| history
detpic/common.inc		diff \| blob \| history
detpic/morse.messages		diff \| blob \| history
detpic/nmra-stream.asm		diff \| blob \| history
detpic/panic.asm		diff \| blob \| history
detpic/program.asm		diff \| blob \| history
detpic/program.clocks		diff \| blob \| history
detpic/reverse.asm		diff \| blob \| history
hostside/.cvsignore		diff \| blob \| history
hostside/Makefile		diff \| blob \| history
hostside/README		diff \| blob \| history
hostside/Structure	[new file with mode: 0644]	blob
hostside/TODO		diff \| blob \| history
hostside/actual.c	[new file with mode: 0644]	blob
hostside/cdumgr.c	[new file with mode: 0644]	blob
hostside/client.c		diff \| blob \| history
hostside/cmdinput.c	[new file with mode: 0644]	blob
hostside/commands.c		diff \| blob \| history
hostside/common.h		diff \| blob \| history
hostside/daemons.h	[new file with mode: 0644]	blob
hostside/dliste.h	[new file with mode: 0644]	blob
hostside/dummy-trains.c	[new file with mode: 0644]	blob
hostside/errorcodes.h.gen	[new file with mode: 0755]	blob
hostside/eventhelp.c	[new file with mode: 0644]	blob
hostside/gui-plan.c		diff \| blob \| history
hostside/hostside.c		diff \| blob \| history
hostside/hostside.h		diff \| blob \| history
hostside/main.c		diff \| blob \| history
hostside/measure-speeds	[new file with mode: 0755]	blob
hostside/multiplex.c	[new file with mode: 0644]	blob
hostside/multiplex.h	[new file with mode: 0644]	blob
hostside/obc.c		diff \| blob \| history
hostside/output.c		diff \| blob \| history
hostside/parse-proto-spec		diff \| blob \| history
hostside/parseutils.c		diff \| blob \| history
hostside/realtime.c	[new file with mode: 0644]	blob
hostside/realtime.h	[new file with mode: 0644]	blob
hostside/record-l.l	[new file with mode: 0644]	blob
hostside/record-y.y	[new file with mode: 0644]	blob
hostside/record.c	[new file with mode: 0644]	blob
hostside/record.h	[new file with mode: 0644]	blob
hostside/retransmit-table.h.gen	[new file with mode: 0755]	blob
hostside/retransmit.c		diff \| blob \| history
hostside/safety.c		diff \| blob \| history
hostside/safety.h		diff \| blob \| history
hostside/santafe-1.speeds	[new file with mode: 0644]	blob
hostside/santafe-2.speeds	[new file with mode: 0644]	blob
hostside/selectors.h.gen		diff \| blob \| history
hostside/selectout.c	[new file with mode: 0644]	blob
hostside/serialio.c		diff \| blob \| history
hostside/skelproto-pic.c		diff \| blob \| history
hostside/skelproto-pic.h		diff \| blob \| history
hostside/speed.c	[new file with mode: 0644]	blob
hostside/startup.c	[new file with mode: 0644]	blob
hostside/stastate.h.gen	[new file with mode: 0755]	blob
hostside/trackloc.c		diff \| blob \| history
hostside/utils.c		diff \| blob \| history
layout/Makefile		diff \| blob \| history
layout/data2safety		diff \| blob \| history
layout/layout		diff \| blob \| history
layout/layout-data.h		diff \| blob \| history
pic.make		diff \| blob \| history

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

RSS Atom