]> git.saurik.com Git - android/aapt.git/history - StringPool.cpp
projects / android / aapt.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
manual merge due to conflicts
[android/aapt.git] / StringPool.cpp
2010-11-06  Jean-Baptiste Queruam 3442611e: am 5580e44c: Merge "Support changing style... blob | commitdiff | raw
2010-11-06  Scott Mainam 4da6efc8: am 46151652: Merge "fix xlarge support... blob | commitdiff | raw
2010-10-22  Dianne Hackbornam 101f14b2: (-s ours) am ba501785: Merge "Implement... blob | commitdiff | raw
2010-10-15  Dan Morrillam b58af2b8: am 5c62ab0a: Merge "Adding a new <uses... blob | commitdiff | raw
2010-10-12  Xavier Ducrohetam ceb3aae3: am 4e1658af: Merge "Avoid pre-processing... blob | commitdiff | raw
2010-10-04  Dianne Hackbornresolved conflicts for merge of 10d5b096 to master blob | commitdiff | raw
2010-09-23  Eric Fischeram 9c708358: am 37cedce1: Merge "Add an aapt option... blob | commitdiff | raw
2010-09-10  Xavier Ducrohetam fa888784: am 89fef418: Merge "Avoid pre-processing... blob | commitdiff | raw
2010-09-03  Dianne Hackbornam 31103928: am 192b56d4: Merge "Implement #2964234... blob | commitdiff | raw
2010-09-02  Jean-Baptiste Queruam d0743dfb: resolved conflicts for merge of bd6abed3... blob | commitdiff | raw
2010-08-31  Xavier Ducrohetam b4649ec7: am 23827557: Merge "Add a --debug-mode... blob | commitdiff | raw
2010-08-26  Kenny Rootam eb0e0f46: am 2e7427f3: Merge "Add LFH offset to... blob | commitdiff | raw
2010-08-25  Brian Carlstromam 7517ffd1: am 59073b15: Merge "Fix linux 64 build... blob | commitdiff | raw
2010-08-24  Dianne Hackbornam 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging... blob | commitdiff | raw
2010-08-16  Ying Wangam 8cfd3c01: am e05184f2: Merge "Output proguard keep... blob | commitdiff | raw
2010-08-16  Eric Fischeram d22a1e89: am 244152bf: Merge "Change aapt\'s warning... blob | commitdiff | raw
2010-08-16  Ficus Kirkpatrickam 44e0d5ca: am 0a6bfe2a: am 2abde6e0: Add --max-res... blob | commitdiff | raw
2010-08-16  Ficus Kirkpatrickam 0f414272: am 7525c2cf: Merge "Add --max-res-version... blob | commitdiff | raw
2010-08-11  Jean-Baptiste Queruam f781b4ef: am e37ab632: Merge "Fix build on some... blob | commitdiff | raw
2010-06-29  The Android Open... am 799a5a61: am 2533a6ad: set up fast-forward from... blob | commitdiff | raw
2010-06-25  Steve BlockFixes a few minor problems with AAPT blob | commitdiff | raw
2010-02-23  Kenny RootUse UTF-8 strings to avoid duplicate caching, part 1 blob | commitdiff | raw | diff to current
2010-02-13  Xavier Ducrohetam ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto... blob | commitdiff | raw | diff to current
2010-02-13  Xavier Ducrohetam 2be56ccb: Merge "Add --auto-add-overlay option to... blob | commitdiff | raw | diff to current
2010-02-05  The Android Open... am 0af04493: am 31bfdf69: reconcile main tree with... blob | commitdiff | raw | diff to current
2010-02-05  The Android Open... am 31bfdf69: reconcile main tree with open-source eclair blob | commitdiff | raw | diff to current
2010-02-02  Jeff HamiltonAdd the --rename-manifest-package option to aapt. blob | commitdiff | raw | diff to current
2010-01-27  Ying Wangam 6efe03b1: am 6f9e2c64: Merge "Find layout classes... blob | commitdiff | raw | diff to current
2010-01-22  Ying Wangam 3c05f1fb: am b5fb50a1: Merge "Add instrumentation... blob | commitdiff | raw | diff to current
2010-01-21  Ying Wangam 6f9e2c64: Merge "Find layout classes in all "layout... blob | commitdiff | raw | diff to current
2010-01-19  Ying Wangam b5fb50a1: Merge "Add instrumentation as a source... blob | commitdiff | raw | diff to current
2010-01-13  Ying Wangam b4f41119: am a1d08886: Merge "Only output proguard... blob | commitdiff | raw | diff to current
2010-01-13  Ying Wangam a1d08886: Merge "Only output proguard keep for nonem... blob | commitdiff | raw | diff to current
2010-01-07  Dianne Hackbornam ce56857e: am cb2d50d0: Fix issue #2357259: aapt... blob | commitdiff | raw | diff to current
2010-01-06  Dianne Hackbornam cb2d50d0: Fix issue #2357259: aapt tool prints ... blob | commitdiff | raw | diff to current
2009-12-15  Android Git AutomergerMerge commit 'goog/eclair-plus-aosp' blob | commitdiff | raw | diff to current
2009-12-11  Jean-Baptiste Queruresolved conflicts for merge of ce307f88 to eclair-mr2 blob | commitdiff | raw | diff to current
2009-12-10  Xavier Ducrohetam ce307f88: Merge change Ie4cdb5a3 into eclair blob | commitdiff | raw | diff to current
2009-12-09  Kenny Rootam e6c0e993: Merge change I129483f8 into eclair-mr2 blob | commitdiff | raw | diff to current
2009-12-07  Kenny RootOptional use of UTF-8 strings in resource bundles blob | commitdiff | raw | diff to current
2009-12-04  Kenny RootFix bitmask in aapt's StringPool length construction blob | commitdiff | raw | diff to current
2009-11-15  Jean-Baptiste Querumerge from eclair blob | commitdiff | raw | diff to current
2009-11-04  Dirk Doughertyam 0d55daff: am 5fc71e67: am 00e44ef2: Merge change... blob | commitdiff | raw | diff to current
2009-11-04  Dirk Doughertyam 5fc71e67: am 00e44ef2: Merge change I54545dfd into... blob | commitdiff | raw | diff to current
2009-10-28  Jean-Baptiste QueruMerge from donut blob | commitdiff | raw | diff to current
2009-10-22  Doug Zongkeram 0b3977f8: am 617262d8: (-s ours) Merge change I37c41... blob | commitdiff | raw | diff to current
2009-10-20  Doug Zongkeram 617262d8: Merge change I37c4157d into eclair blob | commitdiff | raw | diff to current
2009-10-13  Doug Zongkeram afbf8afa: Merge change I564b5b00 into eclair-mr2 blob | commitdiff | raw | diff to current
2009-09-24  Raphaelam 20b39471: Merge change 26933 into eclair blob | commitdiff | raw | diff to current
2009-09-20  Suchi Amalapurapuam f1871e27: Merge change 26009 into eclair blob | commitdiff | raw | diff to current
2009-09-16  Dianne Hackbornam 7fc39b26: Merge change 25238 into eclair blob | commitdiff | raw | diff to current
2009-09-03  Jean-Baptiste Querumerge from donut blob | commitdiff | raw | diff to current
2009-09-03  Robert Greenwaltam e8f605ff: Merge change 23761 into eclair blob | commitdiff | raw | diff to current
2009-09-02  Eric Fischeram 66c70e13: Merge change 23529 into eclair blob | commitdiff | raw | diff to current
2009-09-01  Jean-Baptiste Querumerge from open-source master blob | commitdiff | raw | diff to current
2009-08-21  Kenny RootFix bitmask in aapt's StringPool length construction blob | commitdiff | raw | diff to current
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843 blob | commitdiff | raw | diff to current
2009-03-04  The Android Open... auto import from //depot/cupcake/@135843 blob | commitdiff | raw
2008-10-21  The Android Open... Initial Contribution blob | commitdiff | raw | diff to current
mirror of aapt