projects / zzz-pokedex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e71c435 a580d7c)
Merge branch 'master' of git.veekun.com:pokedex
authorLynn "Zhorken" Vaughan <zhorken@gmail.com>
Mon, 13 Dec 2010 23:40:40 +0000 (18:40 -0500)
committerLynn "Zhorken" Vaughan <zhorken@gmail.com>
Mon, 13 Dec 2010 23:40:40 +0000 (18:40 -0500)

Trivial merge
Original pokedex repository, before media was split off