asedeno.scripts.mit.edu Git - 1ts-debian.git/commit

]> asedeno.scripts.mit.edu Git - 1ts-debian.git/commit - zephyr/h/zephyr/zephyr.h

author	hartmans <hartmans@cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f>
	Fri, 12 Jul 2002 00:20:54 +0000 (00:20 +0000)
committer	hartmans <hartmans@cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f>
	Fri, 12 Jul 2002 00:20:54 +0000 (00:20 +0000)
commit	7a2ec86b202a88dd9256cc80a1b4cbf39eebd37b
tree	ac6a684eb7e9fa0758cbee89779c0dea1f754c04	tree \| snapshot
parent	6946b0cb9b38ecf58ede44970b13d016052037be	commit \| diff

Merge conflicts

git-svn-id: svn://svn.1ts.org/debian/trunk@136 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

13 files changed:

A git-svn clone of the now-gone svn://svn.1ts.org/debian