]> git.tue.mpg.de Git - osl.git/commitdiff
projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72411ed b1f8454)
Merge commit 'athcx/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 19 Apr 2009 21:20:51 +0000 (23:20 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 19 Apr 2009 21:20:51 +0000 (23:20 +0200)
1  2 
osl.c patch | diff1 | diff2 | blob | history

diff --cc osl.c
Simple merge
osl - the object storage layer