aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java
Commit message (Expand)AuthorAge
* Automatic formatting cleanup of Android *.java files.Gravatar jingwen2017-12-18
* Fix bug where merge conflicts for resources defined in XML with equal values ...Gravatar Googler2017-07-13
* Improve the error message for simple values by including the value.Gravatar Googler2017-03-31
* DataSource FixesGravatar Googler2017-03-28
* unknown commit of 5: Fixing the merge warning messages in transitive library ...Gravatar Googler2016-12-01
* Fix target info in conflict error message, to avoid toString on objectsGravatar Googler2016-11-04
* MergeConflict: fix typo in error message string.Gravatar Googler2016-07-29
* Minor backwards compatibility fixes:Gravatar Googler2016-07-21
* 4.95 of 5: Merger changesGravatar Googler2016-05-05
* 3.74 of 5: Remove DataKey from DataValue, FileDataResource and XmlDataResource.Gravatar Googler2016-03-30
* 3.73 of 5: Convert xml parsing to use the map based storageGravatar Googler2016-03-30
* 3.71: Remove ResourceMap, Fix testsGravatar Googler2016-03-25
* Part 3.5 of 5: AssetsGravatar Googler2016-03-25
* Part 3 of 5: Merging semantics.Gravatar Googler2016-03-18
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 16:23:53 +0000