Merge branch 'update-angularjs' into removing-extraneous-for-daptiv-type-definitions

Conflicts:
	angularjs/angular-mocks.d.ts
This commit is contained in:
John Emau
2013-10-14 16:49:45 -07:00
parent 683e94d8d8
commit e06a344578

View File

@@ -2,7 +2,6 @@
// Project: http://angularjs.org
// Definitions: https://github.com/daptiv/DefinitelyTyped
/// <reference path="angular.d.ts" />
///////////////////////////////////////////////////////////////////////////////
@@ -27,7 +26,7 @@ declare module ng {
interface IMockStatic {
// see http://docs.angularjs.org/api/angular.mock.dump
dump(obj: any): string;
// see http://docs.angularjs.org/api/angular.mock.inject
inject(...fns: Function[]): any;