diff options
| author | Ian Leonard <antonlacon@gmail.com> | 2014-08-10 01:09:06 -0700 |
|---|---|---|
| committer | Ian Leonard <antonlacon@gmail.com> | 2014-08-10 01:09:06 -0700 |
| commit | f5a1d1bba66d293486dc74bbc1de767dc7054013 (patch) | |
| tree | 7685a0f8f7e195e22d93ab8ea8825a92d117e229 /lang/python/python3 | |
| parent | d55f37ea1a920beea420a50f4104a3d4109b095a (diff) | |
| parent | 048e700bfc72247e425bd5ace12d90bbc39f8599 (diff) | |
Merge branch 'master' into license-updates
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Conflicts:
devel/patch/Makefile
multimedia/minidlna/Makefile
Diffstat (limited to 'lang/python/python3')
0 files changed, 0 insertions, 0 deletions