aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-01-19 17:57:53 -0800
committerScott Jackson <daneren2005@gmail.com>2015-01-19 17:57:53 -0800
commit3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394 (patch)
tree138459463090a88006035162b3886e483f21ce18 /libs
parent328cd16b9f5f084adc4e64a2744b2e424a2478fd (diff)
parentd5758b2ec0edfc257bab18dd7cab572e2e02dbbe (diff)
downloaddsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.gz
dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.bz2
dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.zip
Merge branch 'master' into DLNA
Conflicts: AndroidManifest.xml
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions