projects / zzz-pokedex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd40dea 0575b5d)
Merge remote-tracking branch 'origin/ability-changes'
authorEevee <git@veekun.com>
Tue, 29 Mar 2011 05:13:33 +0000 (22:13 -0700)
committerEevee <git@veekun.com>
Tue, 29 Mar 2011 05:13:33 +0000 (22:13 -0700)
1  2 
pokedex/data/csv/ability_prose.csv patch | diff1 | diff2 | blob | history

diff --cc pokedex/data/csv/ability_prose.csv
Simple merge
Original pokedex repository, before media was split off