Mercurial > hg > anonet-resdb

annotate db/usr/astrosmash/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 7dc00a6b008b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
192
7dc00a6b008b added git info for astrosmash.ano
Astrosmash <astrosmash@astrosmash.ano>
parents:
diff changeset
1 git://1.1.90.10/