added 1 changeset to branch 'refs/remotes/axeld-github/imap' old head: d6ae76ba37539ab57ff26a379375f46dfe34f2b8 new head: d05a427f72c371666e4c94160bb8b9362d2af3ba overview: https://github.com/axeld/haiku/compare/d6ae76b...d05a427 ---------------------------------------------------------------------------- d05a427: Merge branch 'github_master' into imap Conflicts: src/kits/interface/Rect.cpp src/kits/storage/Path.cpp [ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ] ---------------------------------------------------------------------------- Commit: d05a427f72c371666e4c94160bb8b9362d2af3ba Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> Date: Mon Mar 18 23:24:22 2013 UTC ----------------------------------------------------------------------------