| commit | 8acea7caa39468e6cfd66e1319ba34a9bfe2c3b6 | |
| author | wntrmute <wntrmute@258c5a1a-4f63-435d-9564-e8f6d34ab52c> | |
| Tue, 24 Feb 2009 01:34:40 +0000 (24 01:34 +0000) | ||
| committer | wntrmute <wntrmute@258c5a1a-4f63-435d-9564-e8f6d34ab52c> | |
| Tue, 24 Feb 2009 01:34:40 +0000 (24 01:34 +0000) | ||
| tree | 395b6923269632c3f9183ba5057616a0b77925a9 | treesnapshot (tar.gz zip) |
| parent | 5adfeb396ae7b71747b51c432d3658bf322d969e | commitdiff |
resolve conflict
git-svn-id: https://devkitpro.svn.sourceforge.net/svnroot/devkitpro/trunk/libogc@3301 258c5a1a-4f63-435d-9564-e8f6d34ab52c
git-svn-id: https://devkitpro.svn.sourceforge.net/svnroot/devkitpro/trunk/libogc@3301 258c5a1a-4f63-435d-9564-e8f6d34ab52c
| Makefile | diffblobblamehistory |