| commit | ff1de463bbb64b29ef95e8dfc5b16532ed71f5b7 | |
| author | Benjamin Otte <otte@gnome.org> | |
| Tue, 4 Nov 2008 22:31:50 +0000 (4 23:31 +0100) | ||
| committer | Benjamin Otte <otte@gnome.org> | |
| Tue, 4 Nov 2008 22:31:50 +0000 (4 23:31 +0100) | ||
| tree | 594bace15b866e789c2c955669086855849f2a5f | treesnapshot (tar.gz zip) |
| parent | 80f91fb91f2c288c0b0b05cc09e294237f93443b | commitdiff |
| parent | 1cb0d584ac024b904ce7331702bc19103762d226 | commitdiff |
Merge branch '0.8'
Conflicts:
test/trace/Makefile.am
Conflicts:
test/trace/Makefile.am