| commit | 311255a64618b1a2bf5c93476879a9fed7b0f3ea | |
| author | Carlos R. Mafra <crmafra@gmail.com> | |
| Fri, 12 Apr 2013 01:20:54 +0000 (12 02:20 +0100) | ||
| committer | Carlos R. Mafra <crmafra@gmail.com> | |
| Fri, 12 Apr 2013 01:20:54 +0000 (12 02:20 +0100) | ||
| tree | 505ab46835bf73d36ace17e307c7abae3bc3556a | treesnapshot (tar.gz zip) |
| parent | 529ee0bd215f21a3c84259d8a2503e0dccfa4f7a | commitdiff |
Fix compilation from merge conflict
| WPrefs.app/Workspace.c | diffblobblamehistory | |
| src/dock.c | diffblobblamehistory |