# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1256223332 -32400
# Node ID 8fca17aa57dfe07aeff46a3ae1707c795c762d72
# Parent  47b61865ea8ceb9dac10b1d74dd7402c53ea46e3# Parent  4cff1ffa60dbfbb743372e0f52cfcccbf4945ba0
merge

diff -r 47b61865ea8c -r 8fca17aa57df .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
 1f4c3f3238e6278fa3c73594e027036a1404ec34 fullHD_omedetou
 30568cef3899caea3db0fb9e28b0e6f889c60679 double-linked-task-list
+<<<<<<< local
 0000000000000000000000000000000000000000 ball_bound
 0000000000000000000000000000000000000000 513
 53f6939d7c970bbde5bbe9f32b64463f4ded8f01 ball_bound
+=======
+f8d9830d94cda230d8d544002436a1462a5f8949 ball_bound
+2bc1e486e71d12555fa31ea16b8d47a1bbbee20a ball_bound
+2bc1e486e71d12555fa31ea16b8d47a1bbbee20a -r
+2bc1e486e71d12555fa31ea16b8d47a1bbbee20a 513
+>>>>>>> other