]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58f944b b3a9ca1)
am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so...
authorDan Morrill <morrildl@google.com>
Tue, 14 Dec 2010 19:31:29 +0000 (11:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Dec 2010 19:31:29 +0000 (11:31 -0800)
* commit '0ccc8b7345eac0b507c221be47e55926cbda8957':
  GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).

1  2 
Command.cpp patch | diff1 | diff2 | blob | history

diff --cc Command.cpp
Simple merge
mirror of aapt