view db/usr/cronix/git @ 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 e73e4fac95f5
children
line wrap: on
line source

git://1.22.48.100/