summaryrefslogtreecommitdiffstats
path: root/ThirdPartyProject.prop
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at branches/chromium/742 r89068: Update ThirdPartyProject.propBen Murdoch2011-07-131-1/+1
| | | | Change-Id: Iaed175c2018323e12e78dcdf6fc2cf424ed4ec54
* Merge WebKit at branches/chromium/742 r88085: Update ThirdPartyProject.propSteve Block2011-06-141-2/+4
| | | | Change-Id: Ic297de43b73b2ebce1d20053990f9d71bb54a16f
* Merge WebKit at r84325: Update ThirdPartyProject.propBen Murdoch2011-06-101-2/+2
| | | | Change-Id: I3bd83b97b64c96cc5518cd7c5e4135421a9609f5
* Merge WebKit at r82507: Update ThirdPartyProject.propSteve Block2011-06-081-2/+2
| | | | Change-Id: I55c6d71a66d40ec65751b040c6cc1cb383b7f691
* Merge WebKit at r80534: Update ThirdPartyProject.propBen Murdoch2011-06-021-2/+2
| | | | Change-Id: I6fd3f707dbb4d5f0e6c3dcd5f33a79d22a480ec8
* Merge WebKit at r78450: Update ThirdPartyProject.propSteve Block2011-05-251-2/+2
| | | | Change-Id: I78ff6a852bc093d3ceca4fd51a05782dfcf27fe3
* Merge WebKit at r76408: Update ThirdPartyProject.propBen Murdoch2011-05-231-2/+2
| | | | | | Update merge revisions. Change-Id: I1ffb3ef0f49409fd2a815c1eb06de57889a83820
* Merge WebKit at r75993: Update ThirdPartyProject.propBen Murdoch2011-05-161-2/+2
| | | | Change-Id: Ia4c88dc9bddaca3fb0a694b7e9b662c8193e7298
* Merge WebKit at r75315: Update WebKit versionSteve Block2011-05-131-2/+2
| | | | Change-Id: Ide38889853d77176e4e8733a823bb607644ae9bf
* Merge WebKit at r74534: Update ThirdPartyProject.propBen Murdoch2011-05-101-5/+2
| | | | Change-Id: I2548b0257a8eb52bbe12149640a23352476b05c0
* Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revisionBen Murdoch2011-02-281-1/+1
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78920 on the 597 release branch. Change-Id: I7d73cc447de8511b956a75d8acb1379c21ab266e
* Merge WebKit at Chromium 9.0.597.106: Update WebKit merge revisionSteve Block2011-02-161-1/+1
| | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. This corresponds to r78455 on the 597 release branch. Change-Id: I79be576710a57ed6d72c7c4dd37408c61c159768
* Merge WebKit at Chromium 9.0.597.83: Update WebKit revision number.Ben Murdoch2011-01-251-1/+1
| | | | Change-Id: Ie6cc93dc813c7014ab13015a904b7d9a1706e193
* Merge WebKit at Chromium 9.0.597.76: Update WebKit revision numberBen Murdoch2011-01-201-1/+1
| | | | | | | | | | | | No changes for this merge, just updating the tag. Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. See http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: I9ad6ece190bbbcb283d8d4c624d8baff5023c653
* Merge WebKit at Chromium 9.0.597.69: Update WebKit revision numberBen Murdoch2011-01-161-2/+2
| | | | | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. See http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Iea0b5ca3d811fae101664eb561ab788e10c63ace
* Merge WebKit at Chromium 9.0.597.55: Update WebKit revision numberBen Murdoch2011-01-071-1/+4
| | | | | | | Note that we are tracking the Chromium 9.0.597 release branch, which is WebKit r72805 + stability cherry picks. Change-Id: I640ea1149a9e95b7e27169a298f2fc63b544a269
* Merge WebKit at r72805: Update WebKit revisionSteve Block2011-01-061-2/+2
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: Idd1eee54590180c2efc16861453092295651eba3
* Merge WebKit at r73109: Update WebKit revision number.Shimeng (Simon) Wang2010-12-221-2/+2
| | | | Change-Id: I1748e24000110d5c667f729c25131d5e624de41f
* Merge WebKit at r72274: Update WebKit revision number.Russell Brenner2010-12-021-2/+2
| | | | Change-Id: I38e2e15fe1061f51a5fc299f45763b0e49300b4c
* Merge WebKit at r71558: Update WebKit revision number.Teng-Hui Zhu2010-11-171-2/+2
| | | | Change-Id: I4839c51a42fb175f7e13934b637c2dc669953726
* Merge Webkit at r70949: Update WebKit revision number.John Reck2010-11-091-2/+2
| | | | Change-Id: I08e7b28e921e16d11fc57f24fc6a9a9188463d6f
* Merge WebKit at r70209: Update WebKit revisionBen Murdoch2010-10-261-2/+2
| | | | Change-Id: I9a95c19b76015bfb43393e0570bd35f155dc7809
* Merge WebKit at r68651 : Update WebKit revision and deps fileKristian Monsen2010-10-071-2/+2
| | | | Change-Id: I48411abdd210ef9afd7363cdfb2a1cfa06d81820
* Merge WebKit at r67908: Update WebKit merge revisionSteve Block2010-09-291-2/+2
| | | | Change-Id: Iba3c15bea94293909b64145f5f2d67eab240d2d4
* Merge WebKit at r67178 : Update WebKit revision number.Iain Merrick2010-09-161-2/+2
| | | | Change-Id: I8c5e753cb69f136ea891317b74687622d114c0e2
* Merge WebKit at r66666 : Update WebKit revision number.Kristian Monsen2010-09-111-3/+3
| | | | Change-Id: I9ea57dea7c42952ca49673ecaa51ae83c09246e6
* Remove WEBKIT_MERGE_REVISION in favour of ThirdPartyProject.propSteve Block2010-09-071-2/+4
| | | | Change-Id: Id7330a7535f9cf00557ad11627d40f2ad1ca9537
* add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
Change-Id: I1cc3b4d6e2165285a27b5d848c39d3965553382a