git.99rst.org
/
openwrt-packages.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98be2ca
01eff3f
)
Merge pull request #1032 from commodo/python-updates
author
Steven Barth
<redacted>
Thu, 12 Mar 2015 20:19:52 +0000
(21:19 +0100)
committer
Steven Barth
<redacted>
Thu, 12 Mar 2015 20:19:52 +0000
(21:19 +0100)
python: fix conflicts between python-light & python-base
Trivial merge
git clone https://git.99rst.org/PROJECT
git.99rst.org / openwrt-packages.git / commitdiff