]> git.tue.mpg.de Git - osl.git/commitdiff
projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 208a425 eece377)
Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 1 Aug 2009 19:49:49 +0000 (21:49 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 1 Aug 2009 19:49:49 +0000 (21:49 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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