fix some failed merging and merge r6034 from trunk
authorMikael Magnusson <mikachu@comhem.se>
Fri, 4 May 2007 23:24:54 +0000 (23:24 +0000)
committerMikael Magnusson <mikachu@comhem.se>
Fri, 4 May 2007 23:24:54 +0000 (23:24 +0000)
commit492fb05d1b6704302414789760d035416d115a6e
treeb06ccc9ed9dadc2dd3dd48ba534b318ecafca412
parentb61a258e2d8f2477cdff9ade4d7c931213c75215
fix some failed merging and merge r6034 from trunk
openbox/place.c
tests/grav.c