annotate db/dom/ano/lulzprincess/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 d0adc78f6b4b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
949
d0adc78f6b4b added lulzprincess.ano
lulzprincess <lulzprincess@lulzprincess.ano>
parents:
diff changeset
1 lulzprincess