[Xerte-dev] 1.8 files

[Julian Tenney]

Pat, where have you been checking your files in? To 1.8? Should I take 1.8 conflicts over to the trunk, or leave the trunk files? Therea r anumber of conflicting modifications. Somme I an say are OK, cos I know what the score is (XMLEngine.swf for example) but other (play.php) I don't.

I'm guessing that 1.8 should over-write the trunk files?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20120301/c03d0de9/attachment-0001.html>