# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1256223332 -32400
# Node ID bfbe832660f34afff672408eb66dd445b864d37d
# Parent  fbcbcc5ad3b5b8766b6d9b0859db8b60543b0125# Parent  07e61c1396d7f08aa7ab51c538e92b9a7004f200
merge

diff -r fbcbcc5ad3b5 -r bfbe832660f3 .hgtags
--- a/.hgtags	Thu Oct 22 23:54:58 2009 +0900
+++ b/.hgtags	Thu Oct 22 23:55:32 2009 +0900
@@ -1,6 +1,13 @@
 ce5755f544c1a882c7e28b7c78d8b31a82bd9eda cvs
 18c42658e0e7c44dfd936834465e01797c26198c fullHD_omedetou
 516d5c91d5b4d553844a1ad48ccebbdcd5ebaf20 double-linked-task-list
+<<<<<<< local
 0000000000000000000000000000000000000000 ball_bound
 0000000000000000000000000000000000000000 513
 68d1c088097584e6dd515b11854d4b9eb16b7029 ball_bound
+=======
+085c9284125a2d8f15f9c6f3e44ef8f01e2dcea1 ball_bound
+f5c36e8d5dd23c5a1583b23f70b5b398ede132d5 ball_bound
+f5c36e8d5dd23c5a1583b23f70b5b398ede132d5 -r
+f5c36e8d5dd23c5a1583b23f70b5b398ede132d5 513
+>>>>>>> other