]> git.saurik.com Git - android/aapt.git/history - XMLNode.cpp
am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
[android/aapt.git] / XMLNode.cpp
2009-07-26  Jean-Baptiste Querureconcile korg/master into goog/master
2009-07-26  Jean-Baptiste QueruMerge korg/donut into korg/master
2009-07-22  Android (Google... am 9fc20b0e: Merge change 8126 into donut
2009-07-21  Jean-Baptiste Queruam db7db69a: Merge snapshot variant of donut back into...
2009-07-21  Jean-Baptiste Querudonut snapshot
2009-07-20  Android (Google... am aad0fcc9: Merge change 7783 into donut
2009-07-16  Jean-Baptiste Querumerge-ignore changes that were already in or that are...
2009-07-13  Marco NelissenFormat aapt warnings the same way as other compiler...
2009-06-29  Android (Google... am 72eb0aca: Merge change 5483 into donut
2009-06-19  Android (Google... am 1585bd24: Merge change 4828 into donut
2009-06-10  Android (Google... am 684a2edb: Merge change 3577 into donut
2009-06-08  Robert Greenwaltam fa5c7e1d: Catch when a file resource (non values...
2009-06-06  Robert Greenwaltam 1aa8170e: Add per-named-item overlay ability in...
2009-05-21  The Android Open... Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
2009-05-20  Jean-Baptiste Queruam d3f14a62: reconcile donut snapshot
2009-05-20  Jean-Baptiste Querureconcile donut snapshot
2009-05-19  Android (Google... am 656a2726: Merge change 1910 into donut
2009-05-16  Dianne HackbornMerge commit 'refs/changes/39/1839/1' of ssh://hackbod...
2009-05-16  Dianne Hackbornam 5b3189e0: Fix the build. :(
2009-05-16  Dianne HackbornImplement compatibility support for WRITE_SDCARD permis...
2009-05-16  Dianne HackbornImplement compatibility support for WRITE_SDCARD permis...
2009-05-11  Android (Google... am 6ee44d1: Merge change 1258 into donut
2009-04-23  Jean-Baptiste QueruMerge donut into master
2009-04-23  Jean-Baptiste QueruMerge donut into master
2009-04-20  Marco NelissenMerge branch 'readonly-p4-master'
2009-04-20  Marco NelissenAI 147028: Fix up aapt so it runs cleanly under the...
2009-03-18  Jean-Baptiste QueruMerge commit 'remotes/korg/cupcake' into merge
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843
2009-02-10  The Android Open... auto import from //branches/cupcake/...@130745
2008-12-19  Jean-Baptiste QueruMerge commit 'remotes/korg/cupcake'
2008-12-18  The Android Open... Code drop from //branches/cupcake/...@124589
2008-10-21  The Android Open... Initial Contribution