| commit | 72270047a2b40acb1b6616e90d83ef09a412c139 | |
| author | Cedric Bastoul <cedric.bastoul@u-psud.fr> | |
| Fri, 29 Jun 2012 08:37:28 +0000 (29 10:37 +0200) | ||
| committer | Cedric Bastoul <cedric.bastoul@u-psud.fr> | |
| Fri, 29 Jun 2012 08:37:28 +0000 (29 10:37 +0200) | ||
| tree | 0fffee28b44c497bb145f835ded8baf315abf121 | treesnapshot (tar.gz zip) |
| parent | ed3646ca1699f40fbfda830658b79a5c4fc6c8f4 | commitdiff |
| parent | b6803367ea92160d5a8227f9533f08a7d01191ca | commitdiff |
Merge remote-tracking branch 'joel/scoplib'
Conflicts:
include/osl/generic.h
Conflicts:
include/osl/generic.h
| include/osl/generic.h | diff1 | diff2 | blobhistory |
| include/osl/relation.h | diff1 | diff2 | blobhistory |
| source/relation.c | diff1 | diff2 | blobhistory |