projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9a8f1b b088480)
Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Jun 2008 08:27:14 +0000 (10:27 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Jun 2008 08:27:14 +0000 (10:27 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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