aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgignore7
-rw-r--r--CONTRIBUTORS1
-rw-r--r--src/cmd/devdraw/cocoa-screen.m2
3 files changed, 10 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 8a71772b..ae8348cb 100644
--- a/.hgignore
+++ b/.hgignore
@@ -18,3 +18,10 @@ y.tab.[ch]$
^dict/
^postscript/font/
\.orig$
+config
+install.log
+install.sum
+last-change
+lib/codereview/codereview.pyc
+src/cmd/awk/y.output
+src/cmd/devdraw/latin1.h
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e1ea4fb5..72154085 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -39,6 +39,7 @@ Rob Kroeger <robkroeger@gmail.com>
Rob Pike <robpike@gmail.com>
Russ Cox <rsc@swtch.com>
Sean McKean <smckean83@gmail.com>
+Shenghou Ma <minux.ma@gmail.com>
Ties Bos <gitbisector@gmail.com>
Tim Newsham <tim.newsham@gmail.com>
Tony Lainson <t.lainson@gmail.com>
diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m
index bceb7e3f..24baca1f 100644
--- a/src/cmd/devdraw/cocoa-screen.m
+++ b/src/cmd/devdraw/cocoa-screen.m
@@ -1408,9 +1408,11 @@ winsizepoints()
static NSSize
winsizepixels()
{
+#if DOSX_VERSION >= 100700
if (OSX_VERSION >= 100700 && devdrawretina)
return [win.content convertSizeToBacking: winsizepoints()];
else
+#endif
return winsizepoints();
}