commit | b9ddd5337044c4945564c51d619d78866c644897 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 06 15:29:04 2009 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 06 15:29:04 2009 -0700 |
tree | 397d9a3d12bd572062584a88ce76b6a6620452b7 | |
parent | ead74a19bb446c448dff11f9fc22a1508e49f20b [diff] | |
parent | ca807d6e5d828787e06588af109941cfbbbffef7 [diff] |
Merge commit 'ca807d6e5d828787e06588af109941cfbbbffef7' into merge_korg_master Conflicts: docs/porting-guide.html