Skip to content

Merge exercise #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fandi-kawtar wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Merge exercise #172

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2957f3e
Adding pokemon to dog.c
kennyyu Sep 14, 2013
4bcd101
added charmander's family
kennyyu Oct 23, 2013
ead6bf6
added bulbasaur's family
kennyyu Oct 23, 2013
b26d6aa
added squirtle's family
kennyyu Oct 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions dog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,13 @@ canine
wolf
bark
bow wow
pikachu
charmander
squirtle
bulbasaur
charmelon
charizard
ivysaur
venasaur
wartortle
blastoise