Mercurial > hg > anonet-resdb
annotate db/usr/mirsal/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 | 17786650eb70 |
children |
rev | line source |
---|---|
387
17786650eb70
Add mirsal's git repository URL to the db
Anonymous Coward <nobody@nowhere>
parents:
diff
changeset
|
1 git://1.0.86.1/ |