]> git.tuebingen.mpg.de Git - osl.git/commitdiff
projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e931498 c2e27a8)
Merge branch 'master' into next
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 27 Sep 2020 17:06:14 +0000 (19:06 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 27 Sep 2020 17:06:14 +0000 (19:06 +0200)
* master:
  build: Fix manual setting of CC.
  build: Don't set CC twice.
  build: Tell make(1) that the compiler creates .d files.
  Update .gitignore.

1  2 
Makefile patch | diff1 | diff2 | blob | history

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