]> git.saurik.com Git - android/aapt.git/history - Command.cpp
resolved conflicts for merge of 54cb63e2 to master
[android/aapt.git] / Command.cpp
2011-04-27  Conley OwensIgnore xml change since file no longer exists
2011-04-12  Kenny Rootresolved conflicts for merge of 87b3c0dc to honeycomb...
2011-02-28  Xavier Ducrohetam ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add ...
2011-02-28  Xavier Ducrohetam dff6b8e7: Merge "Add --non-constant-id to aapt."
2011-01-30  Dianne Hackbornam a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize...
2011-01-30  Dianne Hackbornam a30063d8: am 25eb0464: Merge "Normalize output from...
2011-01-29  Dianne Hackbornam e802b592: am 2107757d: am bbb5a5ce: Merge "Make...
2011-01-29  Dianne Hackbornam 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry...
2011-01-25  Dianne Hackbornam 1240719a: am bcf2adeb: Merge "aapt: Allow raw "...
2011-01-23  Dianne Hackbornam bcf2adeb: Merge "aapt: Allow raw "%" in unformatted...
2010-12-15  android-mergerMerge branch 'master' into honeycomb-release
2010-12-14  Dan Morrillam 0ccc8b73: am 5441a9ff: Merge "GL texture filtering...
2010-12-14  Dan Morrillam 5441a9ff: Merge "GL texture filtering changed from...
2010-12-14  Dan MorrillGL texture filtering changed from AND to OR, so rename...
2010-11-06  Jean-Baptiste Queruam 3442611e: am 5580e44c: Merge "Support changing style...
2010-11-06  Scott Mainam 4da6efc8: am 46151652: Merge "fix xlarge support...
2010-11-05  Jean-Baptiste Queruam 5580e44c: Merge "Support changing style parent in...
2010-11-05  Scott Mainam 46151652: Merge "fix xlarge support in aapt for...
2010-11-05  Scott Mainfix xlarge support in aapt for gingerbread
2010-10-22  Dianne HackbornImplement issue #3116702: New manifest tags for support...
2010-10-22  Dianne Hackbornam 101f14b2: (-s ours) am ba501785: Merge "Implement...
2010-10-22  Dianne Hackbornam ba501785: Merge "Implement issue #3116702: New manif...
2010-10-21  Dianne HackbornImplement issue #3116702: New manifest tags for support...
2010-10-15  Dan Morrillam b58af2b8: am 5c62ab0a: Merge "Adding a new <uses...
2010-10-13  Dan Morrillam 5c62ab0a: Merge "Adding a new <uses-gl-texture/...
2010-10-13  Dan MorrillAdding a new <uses-gl-texture/> tag, to be used to...
2010-10-12  Xavier Ducrohetam ceb3aae3: am 4e1658af: Merge "Avoid pre-processing...
2010-10-04  Dianne Hackbornresolved conflicts for merge of 10d5b096 to master
2010-09-23  Eric Fischeram 9c708358: am 37cedce1: Merge "Add an aapt option...
2010-09-10  Xavier Ducrohetam fa888784: am 89fef418: Merge "Avoid pre-processing...
2010-09-10  Xavier Ducrohetam 89fef418: Merge "Avoid pre-processing images when...
2010-09-03  Dianne Hackbornam 31103928: am 192b56d4: Merge "Implement #2964234...
2010-09-03  Dianne Hackbornam 192b56d4: Merge "Implement #2964234: Add support...
2010-09-03  Dianne HackbornImplement #2964234: Add support for <uses-package>...
2010-09-02  Jean-Baptiste Queruam d0743dfb: resolved conflicts for merge of bd6abed3...
2010-09-02  Jean-Baptiste Queruresolved conflicts for merge of bd6abed3 to gingerbread...
2010-08-31  Xavier Ducrohetam b4649ec7: am 23827557: Merge "Add a --debug-mode...
2010-08-26  Kenny Rootam eb0e0f46: am 2e7427f3: Merge "Add LFH offset to...
2010-08-26  Kenny Rootam 2e7427f3: Merge "Add LFH offset to verbose list...
2010-08-26  Kenny RootMerge "Add LFH offset to verbose list of APK" into...
2010-08-25  Brian Carlstromam 7517ffd1: am 59073b15: Merge "Fix linux 64 build...
2010-08-25  Kenny RootAdd LFH offset to verbose list of APK
2010-08-24  Dianne Hackbornam 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging...
2010-08-20  Dianne Hackbornam 42f90ca5: Merge "Fix aapt dump badging to support...
2010-08-20  Dianne HackbornFix aapt dump badging to support xlarge screens.
2010-08-16  Ying Wangam 8cfd3c01: am e05184f2: Merge "Output proguard keep...
2010-08-16  Eric Fischeram d22a1e89: am 244152bf: Merge "Change aapt\'s warning...
2010-08-16  Ficus Kirkpatrickam 44e0d5ca: am 0a6bfe2a: am 2abde6e0: Add --max-res...
2010-08-16  Ficus Kirkpatrickam 0f414272: am 7525c2cf: Merge "Add --max-res-version...
2010-08-11  Jean-Baptiste Queruam f781b4ef: am e37ab632: Merge "Fix build on some...
2010-06-29  The Android Open... am 799a5a61: am 2533a6ad: set up fast-forward from...
2010-06-25  Steve BlockFixes a few minor problems with AAPT
2010-06-17  Dan Morrillam dde1ae84: am 45378f07: am 6b22d81a: As Donut (API...
2010-06-17  Dan Morrillam 6b22d81a: As Donut (API=4) devices and earlier do...
2010-06-17  Dan MorrillAs Donut (API=4) devices and earlier do not have a...
2010-06-16  Dan MorrillAs Donut (API=4) devices and earlier do not have a...
2010-05-05  Dan Morrillam 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71...
2010-05-04  Dan Morrillam f7ebcfec: am e17b4e71: Merge "Adding the backward...
2010-05-04  Dan MorrillAdding the backward-compatible filtering heuristics...
2010-03-10  Dianne HackbornAdd ability for some manifest attributes to reference...
2010-03-02  Dianne HackbornFix issue #2448075: aapt doesn't fix up activity-alias...
2010-02-13  Xavier Ducrohetam ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto...
2010-02-13  Xavier Ducrohetam 2be56ccb: Merge "Add --auto-add-overlay option to...
2010-02-12  Jeff HamiltonDump original-package entries.
2010-02-05  The Android Open... am 0af04493: am 31bfdf69: reconcile main tree with...
2010-02-05  The Android Open... am 31bfdf69: reconcile main tree with open-source eclair
2010-02-05  The Android Open... reconcile main tree with open-source eclair
2010-01-27  Ying Wangam 6efe03b1: am 6f9e2c64: Merge "Find layout classes...
2010-01-22  Ying Wangam 3c05f1fb: am b5fb50a1: Merge "Add instrumentation...
2010-01-21  Ying Wangam 6f9e2c64: Merge "Find layout classes in all "layout...
2010-01-19  Ying Wangam b5fb50a1: Merge "Add instrumentation as a source...
2010-01-13  Ying Wangam b4f41119: am a1d08886: Merge "Only output proguard...
2010-01-13  Ying Wangam a1d08886: Merge "Only output proguard keep for nonem...
2010-01-12  The Android Open... android-2.1_r1 snapshot
2010-01-07  Dianne Hackbornam ce56857e: am cb2d50d0: Fix issue #2357259: aapt...
2010-01-06  Dianne Hackbornam cb2d50d0: Fix issue #2357259: aapt tool prints ...
2010-01-06  Dianne HackbornFix issue #2357259: aapt tool prints "uses-configuation:"
2009-12-15  Android Git AutomergerMerge commit 'goog/eclair-plus-aosp'
2009-12-15  Kenny Rootam 15f1bfb0: Merge change I70d0bddb into eclair-mr2
2009-12-11  Kenny Rootam b5ef7ee1: Default to UTF8 resources when packaging...
2009-12-11  Jean-Baptiste Queruam a5a8cc13: resolved conflicts for merge of ce307f88...
2009-12-11  Jean-Baptiste Queruresolved conflicts for merge of ce307f88 to eclair-mr2
2009-12-10  Xavier Ducrohetam ce307f88: Merge change Ie4cdb5a3 into eclair
2009-12-09  Kenny Rootam e6c0e993: Merge change I129483f8 into eclair-mr2
2009-12-07  Kenny RootOptional use of UTF-8 strings in resource bundles
2009-12-05  Kenny Rootam fc32a062: Merge change I88721afe into eclair-mr2
2009-12-01  Xavier DucrohetAdd --custom-package to aapt
2009-11-15  Jean-Baptiste Querumerge from eclair
2009-11-13  Jean-Baptiste Querueclair snapshot
2009-11-04  Dirk Doughertyam 0d55daff: am 5fc71e67: am 00e44ef2: Merge change...
2009-11-04  Dirk Doughertyam 5fc71e67: am 00e44ef2: Merge change I54545dfd into...
2009-11-04  Dirk Doughertyam 00e44ef2: Merge change I54545dfd into eclair-sdk
2009-10-28  Jean-Baptiste Querumerge from open-source master
2009-10-28  Jean-Baptiste Querumerge from open-source master
2009-10-28  Jean-Baptiste QueruMerge from donut
2009-10-22  Doug Zongkeram 0b3977f8: am 617262d8: (-s ours) Merge change I37c41...
2009-10-20  Doug Zongkeram 617262d8: Merge change I37c4157d into eclair
2009-10-20  Doug Zongkeradd "junk path" -k option to aapt (DO NOT MERGE)
2009-10-13  Doug Zongkeram afbf8afa: Merge change I564b5b00 into eclair-mr2
2009-10-13  Doug Zongkeradd "junk path" -k option to aapt
next