| commit | a8a977a97babddacd406f09b8106ff9f0ef18993 | [log] [tgz] |
|---|---|---|
| author | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jul 17 18:27:03 2012 +0000 |
| committer | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jul 17 18:27:03 2012 +0000 |
| tree | 39f181bfb309167d9b2c5976ff3035b49f0bc09f | |
| parent | 4dffc596aa9fabd3104e66bc1f9957e8de4cb65d [diff] |
Update docs and trunk dirs if they exist overriding any local merge conflicts. Created to fix bug http://code.google.com/p/skia/issues/detail?id=710 : housekeeping buildbot: conflict in UpdateDoxygen step. git-svn-id: http://skia.googlecode.com/svn/trunk@4640 2bbb7eff-a529-9590-31e7-b0007b416f81