diff options
| author | slipstream/RoL <l33twax@yahoo.com> | 2017-02-26 14:31:48 +0000 |
|---|---|---|
| committer | slipstream/RoL <l33twax@yahoo.com> | 2017-02-26 14:31:48 +0000 |
| commit | fa8ec50f6c188d9c57bfb78f8100c57b7fc495d6 (patch) | |
| tree | 381abbb5160482f2a0bd42b505c68e44c9876bf8 | |
| parent | e37cc7de9583b00166e96a6632ba25edefff43ca (diff) | |
| parent | a73a0f06e04ddac7d5a122d9de6aaa43c2cc06f4 (diff) | |
| download | gen3uploader-fa8ec50f6c188d9c57bfb78f8100c57b7fc495d6.tar.gz gen3uploader-fa8ec50f6c188d9c57bfb78f8100c57b7fc495d6.tar.bz2 gen3uploader-fa8ec50f6c188d9c57bfb78f8100c57b7fc495d6.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/README.md b/README.md index b833c50..afba524 100644 --- a/README.md +++ b/README.md | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # GBA Gen3 Multiboot | 1 | # GBA Gen3 Multiboot |
| 2 | A GC and Wii homebrew app that sends a binary to the GBA using the different multiboot protocol used by the third generation of Pokémon games (Ruby, Sapphire, Emerald, FireRed, LeafGreen). | 2 | A GC and Wii homebrew app that sends a binary to the GBA using the different multiboot protocol used by the third generation of Pokémon games (Ruby, Sapphire, Emerald, FireRed, LeafGreen). |
| 3 | 3 | ||
| 4 | # Usage | 4 | # Usage |