aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-09-27 19:24:41 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2012-09-27 19:24:41 +0200
commit7f36e396768722319b4036b845cd9a105b60bd5b (patch)
treecc91384b68fe52ce18a06dcc10331319f0b0de1a /Makefile
parentebe3f89ea45dc74bbadab10acc27ebf91ddbb736 (diff)
parent795cc5059a6f349f861e246269d6cced39b3a753 (diff)
Merge remote-tracking branch 'FiloSottille/supports'
Conflicts: youtube-dl
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions