]> code.citadel.org Git - citadel.git/commit
* Display conflicts nicely
authorArt Cancro <ajc@citadel.org>
Mon, 21 Oct 2002 20:16:38 +0000 (20:16 +0000)
committerArt Cancro <ajc@citadel.org>
Mon, 21 Oct 2002 20:16:38 +0000 (20:16 +0000)
commit0921a1ceaa33597ba6b136cc649853285ead22f6
tree4f1767a77d29a1a359bfce35b9b4b765c9db2c45
parenta49e8ac18cdb0e6c6028c1302ef76fc000de1d03
* Display conflicts nicely
webcit/ChangeLog
webcit/calendar.c