]> git.saurik.com Git - android/aapt.git/history - XMLNode.cpp
resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
[android/aapt.git] / XMLNode.cpp
2012-09-26  Xavier Ducrohetam f7243dcc: Add --error-on-failed-insert option to...
2012-09-26  Xavier Ducrohetam 6c6ddbff: Fix writing text version of styleable...
2012-09-20  Jean-Baptiste QueruIgnore 12496bfc into jb-dev-plus-aosp
2012-08-08  Jean-Baptiste Queruam c1c55afb: am e67f8c8c: Merge "Normalize output from...
2012-08-08  Jean-Baptiste Queruam e67f8c8c: Merge "Normalize output from aapt d xmltree"
2012-08-08  Jean-Baptiste QueruMerge "Normalize output from aapt d xmltree"
2012-07-08  Shachar ShemeshNormalize output from aapt d xmltree
2012-06-22  Jean-Baptiste Queruam 8c71784e: Merge "Initialize mJunkPath to false"
2012-06-06  Jean-Baptiste Queruam c9fe6568: am 9e22d9c5: Merge "Fix "Too many open...
2012-06-05  Tor Norbyeam 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore...
2012-06-02  Jean-Baptiste Queruam 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal...
2012-05-30  Raphaël Mollam ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge...
2012-05-18  Raphael Mollam 8748399f: am 61394501: Merge "Support a new ANDROID_...
2012-05-01  Jean-Baptiste Queruresolved conflicts for merge of 13c04786 to jb-dev...
2012-05-01  Jean-Baptiste Queruresolved conflicts for merge of bc2fb7b9 to jb-dev...
2012-05-01  Jean-Baptiste QueruMerge "Runtime resource overlay: clean-up."
2012-05-01  Jean-Baptiste QueruMerge "Build overlay packages just like regular packages."
2012-03-22  Mike LockwoodMerge remote-tracking branch 'goog/ics-aah-exp' into...
2012-03-16  Jeff BrownRemove dead code in StringPool.
2012-02-24  inazarukam 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix...
2012-02-24  inazarukam 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom...
2012-02-24  Xavier Ducrohetam b3c780f1: am 816b873d: Move the automatic namespace...
2012-02-24  Xavier Ducrohetam 816b873d: Move the automatic namespace outside of...
2012-02-24  inazarukam eed8d0b3: Fix for issue 9656 - custom xml attributes...
2012-02-24  Xavier Ducrohetam 816b873d: Move the automatic namespace outside of...
2012-02-24  Xavier Ducrohetam 816b873d: Move the automatic namespace outside of...
2012-02-24  inazarukam eed8d0b3: Fix for issue 9656 - custom xml attributes...
2012-02-24  Xavier DucrohetMove the automatic namespace outside of the res namespa...
2012-02-24  inazarukFix for issue 9656 - custom xml attributes in Android...
2012-02-24  Xavier DucrohetMove the automatic namespace outside of the res namespace.
2012-02-23  Jean-Baptiste Queruam 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5...
2012-02-23  Jean-Baptiste Queruam fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for...
2012-02-23  Jean-Baptiste Queruam 63e43ba5: Merge "Fix for issue 9656 - custom xml...
2012-02-23  Jean-Baptiste QueruMerge "Fix for issue 9656 - custom xml attributes in...
2012-02-06  Xavier Ducrohetam c205a9d6: am f8aea993: Make aapt ignore tools-relate...
2012-02-06  Xavier Ducrohetam f8aea993: Make aapt ignore tools-related data.
2012-02-06  Xavier Ducrohetam f8aea993: Make aapt ignore tools-related data.
2012-02-06  Xavier DucrohetMake aapt ignore tools-related data.
2012-02-03  Xavier DucrohetMake aapt ignore tools-related data.
2011-08-18  Xavier Ducrohetam f4750724: am 9d829f98: am 21e6e2de: Merge "Change...
2011-07-28  Xavier Ducrohetam 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove...
2011-07-21  Xavier Ducrohetam 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to...
2011-07-21  Xavier Ducrohetresolved conflicts for merge of ea9e6d24 to honeycomb...
2011-07-20  Xavier Ducrohetresolved conflicts for merge of 2c311be7 to honeycomb...
2011-07-19  Xavier Ducrohetam ba6c98db: am 82943ecf: am d40c93f6: Merge "Add depen...
2011-07-19  Xavier Ducrohetam d5431ed5: am 2e659ae5: am 42755155: Merge "Copy...
2011-05-28  inazarukFix for issue 9656 - custom xml attributes in Android...
2011-05-20  The Android Open... Reconcile with honeycomb-release
2011-04-27  Conley OwensIgnore xml change since file no longer exists
2011-04-27  Conley OwensMerge changes I0ab47e2f,Ib8016996
2011-04-11  Shachar ShemeshNormalize output of XMLtree content
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-30  Dianne HackbornMerge "Normalize output from aapt d"
2011-01-04  Shachar ShemeshNormalize output from aapt d
2010-11-05  Jean-Baptiste Queruam 5580e44c: Merge "Support changing style parent in...
2010-10-26  Patrick ScottFix debug statements and aapt assert.
2010-10-22  Dianne Hackbornam 101f14b2: (-s ours) am ba501785: Merge "Implement...
2010-10-15  Dan Morrillam b58af2b8: am 5c62ab0a: Merge "Adding a new <uses...
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-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-25  Brian Carlstromam 7517ffd1: am 59073b15: Merge "Fix linux 64 build...
2010-08-24  Dianne Hackbornam 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging...
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-13  Ying WangMerge "Output proguard keep flags for fragment classes...
2010-08-13  Eric Fischeram 244152bf: Merge "Change aapt\'s warning message...
2010-08-13  Eric FischerMerge "Change aapt's warning message to suggest formatt...
2010-08-13  Eric FischerChange aapt's warning message to suggest formatted...
2010-08-13  Ficus Kirkpatrickam 2abde6e0: Add --max-res-version flag to aapt.
2010-08-11  Jean-Baptiste Queruam f781b4ef: am e37ab632: Merge "Fix build on some...
2010-08-11  Jean-Baptiste Queruam e37ab632: Merge "Fix build on some linux machines"
2010-06-29  The Android Open... am 799a5a61: am 2533a6ad: set up fast-forward from...
2010-06-29  The Android Open... set up fast-forward from froyo-release to gingerbread
2010-06-25  Steve BlockFixes a few minor problems with AAPT
2010-06-17  Dan Morrillam 6b22d81a: As Donut (API=4) devices and earlier do...
2010-06-15  Joe Onoratoam 9d71860e: Merge "The aapt and aidl tools are prebuil...
2010-06-06  Dianne Hackbornam 5474902f: Merge "xhdpi" into froyo
2010-06-03  Kenny Rootam 5095232d: am 15fe2cb7: Add error checking for transl...
2010-06-03  Kenny RootAdd error checking for translatable strings
2010-02-13  Xavier Ducrohetam ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto...
2010-02-05  The Android Open... am 0af04493: am 31bfdf69: reconcile main tree with...
2010-02-02  Jeff HamiltonAdd the --rename-manifest-package option to aapt.
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-13  Ying Wangam b4f41119: am a1d08886: Merge "Only output proguard...
2010-01-07  Dianne Hackbornam ce56857e: am cb2d50d0: Fix issue #2357259: aapt...
2009-12-15  Android Git AutomergerMerge commit 'goog/eclair-plus-aosp'
2009-12-11  Jean-Baptiste Queruresolved conflicts for merge of ce307f88 to eclair-mr2
2009-12-09  Kenny Rootam e6c0e993: Merge change I129483f8 into eclair-mr2
next