If you don't do the merges, you can stop reading now -- though you might ask yourself why you're not doing the merges. They are so much fun.
In the next few days (hopefully not weeks), I am making changes to InspectorController in an effort to unfork it. This is the good news. The bad news is that there's a certain transition period, during which merging InspectorController will seem a little bit ... difficult. So, to make your merging work easier, here are the instructions: * Don't accept any changes from upstream to InspectorController.(cpp|h|idl). See? Easy! :DG< --~--~---------~--~----~------------~-------~--~----~ Chromium Developers mailing list: chromium-dev@googlegroups.com View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~----------~----~----~----~------~----~------~--~---