diff options
| author | Juergen Daubert <jue@jue.li> | 2020-11-19 15:19:09 +0000 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2020-11-19 15:19:09 +0000 |
| commit | 071aa58a46615ab3725a49ee987893d54205acd8 (patch) | |
| tree | 9892ebb179d9c867eb73b48a4de065e6ef3a9119 /python3-xlib/.footprint | |
| parent | 71e00d88efd371016987ec327ff80f68a99ca276 (diff) | |
| parent | 0df5e07a9f13025389f3a614628c50b3c2569f2b (diff) | |
| download | contrib-071aa58a46615ab3725a49ee987893d54205acd8.tar.gz contrib-071aa58a46615ab3725a49ee987893d54205acd8.tar.xz | |
Merge branch '3.5' into 3.6
Conflicts:
highlight/.signature
mercurial/.footprint
mercurial/.signature
picard/.footprint
picard/.signature
picard/Pkgfile
python3-gpgme/.footprint
python3-gpgme/.signature
youtube-dl/.footprint
youtube-dl/.signature
Diffstat (limited to 'python3-xlib/.footprint')
0 files changed, 0 insertions, 0 deletions