view db/as/125/owner @ 1119:5645d1ed79c5 draft

There was some werid stuff with add_dom went with what looked like the best of the conflicting lines. Merge branch 'master' of git://1.4.7.7/resdb Conflicts: scripts/add_dom
author epoch <epoch@hacking.allowed.org>
date Fri, 24 May 2013 02:39:47 +0000
parents 3fd990ae56f6
children
line wrap: on
line source

Richard