]> git.tue.mpg.de Git - osl.git/commitdiff
projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c912c0e ccff475)
Merge commit 'stark/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 2 Feb 2009 18:27:20 +0000 (19:27 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 2 Feb 2009 18:27:20 +0000 (19:27 +0100)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
osl - the object storage layer