| commit | bad4d055da362a01cf64667d0761743589ccb559 | |
| author | Kazuki Sakamoto <sakamoto@splhack.org> | |
| Fri, 5 Mar 2010 01:54:00 +0000 (5 10:54 +0900) | ||
| committer | Kazuki Sakamoto <sakamoto@splhack.org> | |
| Fri, 5 Mar 2010 01:54:00 +0000 (5 10:54 +0900) | ||
| tree | 36a215b9ac6e7e384b26a2fca53d380cbb1603e8 | treesnapshot (tar.gz zip) |
| parent | 07762b024e4fa57f0744ceacd7764939ffb992cd | commitdiff |
| parent | 0c338765d839510c81ba786ea799c27a6ed8118a | commitdiff |
Merge branch 'KaoriYa'
Conflicts:
src/auto/configure
Conflicts:
src/auto/configure