Mercurial > hg > anonet-resdb

annotate db/usr/cronix/git @ 1119:5645d1ed79c5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
89
e73e4fac95f5 Updated IP info for cronix
cronix <cronix@CrystalNET.eu.eu>
parents: 74
diff changeset
1 git://1.22.48.100/