diff src/m/sr2k.h @ 83655:67f4cd925834

Fix 2007-08-21 merge conflicts.
author Juri Linkov <juri@jurta.org>
date Wed, 22 Aug 2007 23:45:47 +0000
parents 49b363c28dce
children f27b84de02cf
line wrap: on
line diff