comparison src/frame.h @ 72891:24025d20791a

Fix previous commit: Remove conflict marker. Undo unification of Pavel Janik's name.
author Reiner Steib <Reiner.Steib@gmx.de>
date Fri, 15 Sep 2006 09:03:48 +0000
parents 6b4b6ba02f17
children 9f89a8f57a99 b19aaf4ab0ee 8a8e69664178
comparison
equal deleted inserted replaced
72890:5ba1cd1da822 72891:24025d20791a