]> git.tue.mpg.de Git - osl.git/commit
projects / osl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 280f5ea 3f0d225)
Merge branch 'refs/heads/t/lopsub'
authorAndre Noll <maan@tuebingen.mpg.de>
Mon, 3 Jun 2019 12:05:10 +0000 (14:05 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Mon, 3 Jun 2019 12:05:10 +0000 (14:05 +0200)
commit9aadc0af8df91d309f9f701f07a6db0542341618
treeb2ab02d4a0b8f8d5db4cbdf45a2d6e0739365ea0tree | snapshot
parent280f5eaf389483d35af6ad9211d003ffa73cb2accommit | diff
parent3f0d225f1e9892d59bcc2c3b23c8945526595fcccommit | diff
Merge branch 'refs/heads/t/lopsub'

* refs/heads/t/lopsub:
  Convert oslfsck to lopsub.

The merge conflicted twice for the Makefile because of commit
ec08b17c7514 which touched the object list of oslfsck and added
-DVERSION to the CPPFLAGs. This was easy to fix, though.
Makefile diff1 | diff2 | blob | history
osl - the object storage layer