diff options
author | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:20:21 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:20:21 +0200 |
commit | 652be92a21f5575e5f74f6abe98eb4200b86776c (patch) | |
tree | acf3dcdf931dad33bdef322565b74eb11079a529 /lib/resource.h | |
parent | f196b12c62633e382541ba156e6df1534860c568 (diff) | |
parent | 9e60b500c76945ccdea94d3a67e7acfde5e3f969 (diff) |
Merge remote-tracking branch 'origin/master' into haugesund-to-2.0
Diffstat (limited to 'lib/resource.h')
0 files changed, 0 insertions, 0 deletions