Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master and master-upgrade branch #2

Merged
merged 2 commits into from Jun 26, 2013
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Update for language changes

  • Loading branch information
brson committed Jun 26, 2013
commit 8a15a3bd2bd98ee4fb0513b71d7055c8be40a4b7
@@ -12,7 +12,7 @@ use AlertMethods;
use cocoa::appkit::{NSPoint, NSRect, NSSize};
use cocoa::base::{objc_getClass, sel_registerName};
use cocoa::base;
use core::cast::{transmute, transmute_copy};
use std::cast::{transmute, transmute_copy};
use core_foundation::string::CFString;

/// The low-level alert type.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.