OSDN Git Service

(root) / android-x86 / external-toybox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 046214f b5b37ac)
Merge remote-tracking branch \'toybox/master\' into HEAD
authorRob Landley <rob@landley.net>
Wed, 25 May 2016 21:20:00 +0000 (21:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 21:20:00 +0000 (21:20 +0000)
am: b5b37acaac

* commit 'b5b37acaac3661ee9fabbf3cc4ab5026cd534f41':
  The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)

Change-Id: Ib0a3a91d79f05175bac63ef1ff423f5e1df86c6d


Trivial merge
external/toybox
About OSDN
Find Software
Develop Software
Help