projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71da412 a0a709d)
Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 6 Jun 2008 14:46:50 +0000 (16:46 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 6 Jun 2008 14:46:50 +0000 (16:46 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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