Re: [Scribia-dev] crash & new stuff

[Charles L. <da...@sy...>]

>Anyway, my area is GUI and i've checked in sorting for all GUI views! :)

weird. i just did a check out and here's what ended up in the
CScribiaDocumentWindow.cp file, somewhere in the middle of the #includes:

<<<<<<< CScribiaDocumentWindow.cp
//#include "CSharesTable.h"
=======
>>>>>>> 1.15

sounds like some CVS log thing, but it obviously doesn't compile :) i
deleted the weird lines and committed the change.


--

charles lechasseur - da...@sy...
http://www3.sympatico.ca/danov/marathon/

  "The butts of evil are awaiting my bootprints!"
     - Minsc