christos a58881f52e resolve conflicts		2006-02-05 16:28:55 +00:00
..
amq_clnt.c	resolve conflicts	2006-02-05 16:28:55 +00:00
amq_xdr.c
amq.8
amq.c	resolve conflicts	2006-02-05 16:28:55 +00:00
amq.h	resolve conflicts	2006-02-05 16:28:55 +00:00
Makefile.am
pawd.1
pawd.c	resolve conflicts	2006-02-05 16:28:55 +00:00