summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2019-01-18 14:12:34 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2019-01-18 14:12:34 +0100
commit64cd95d6d514886914fa11ca523234a9c9687326 (patch)
tree265d49efdebbec3124dfa6c6c2b525c7a8bb6f4d /src/Makefile
parent6bc3fa37681563882a03ec9b0eaf821d82c10964 (diff)
parent2167908f8e97a8d4927ad6e1d619c4c4869e97b8 (diff)
Merge branch 'fix-dependencies' (STR 3506)
This is intentionally a merge commit that includes both the fix necessary for STR 3506 and the update of all remaining dependencies.
Diffstat (limited to 'src/Makefile')
0 files changed, 0 insertions, 0 deletions