Mercurial > hg > easyhg
view src/common_osx.mm @ 505:1c05e7576ea5
Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author | Chris Cannam |
---|---|
date | Mon, 17 Oct 2011 16:25:02 +0100 |
parents | 2d3f1e5d8638 |
children |
line wrap: on
line source
#include "common.h" #include <QString> #ifdef Q_OS_MAC #include <Foundation/Foundation.h> QString getUserRealName() { NSString *s = NSFullUserName(); return QString::fromLocal8Bit([s UTF8String]); } #endif