diff options
author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-28 09:34:05 +0000 |
---|---|---|
committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-28 09:34:05 +0000 |
commit | 119e898cc8a7646948d286c2e47f166ed0138c2c (patch) | |
tree | 6ef5fc8fa5c5c2c427140fa7c1aa61001aaff54e | |
parent | a202dfdf10e39ad24b70cc2a754d64fd79771a3d (diff) | |
parent | 20ea5f65427d3f36dcda8149895b1064c05751c8 (diff) | |
download | aports-119e898cc8a7646948d286c2e47f166ed0138c2c.tar.bz2 aports-119e898cc8a7646948d286c2e47f166ed0138c2c.tar.xz |
Merge branch 'master' into xbmc
Conflicts:
main/xproto/APKBUILD
0 files changed, 0 insertions, 0 deletions