Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame committed 2016-03-17 21:06:54 +09:00
commit 7de6c3dd94
1140 files changed
+179704 -179635

No files matched your search

+2 -2
View File
@@ -3,7 +3,7 @@
// Definitions by: Craig Younkins <https://github.com/cyounkins/>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
declare module Ti {
declare namespace Ti {
export var apiName : string;
export var bubbleParent : boolean;
export var buildDate : string;
@@ -6153,7 +6153,7 @@ declare class recurrenceEndDictionary {
occurrenceCount : number;
}
declare module Global {
declare namespace Global {
export function L (key: string, hint?: string) : string;
export function alert (message: string) : void;
export function clearInterval (timerId: number) : void;