Merge branch 'master' into handleExtraObjectLiteralProperties

Conflicts:
	angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
This commit is contained in:
Daniel Rosenwasser
2015-08-17 12:28:46 -07:00
241 changed files with 45690 additions and 6535 deletions
-1
View File
@@ -1 +0,0 @@
Vendored
+1 -1
View File
@@ -830,7 +830,7 @@ declare module d3 {
style(name: string, value: (datum: Datum, index: number, outerIndex: number) => Primitive, priority?: string): Transition<Datum>;
style(obj: { [key: string]: Primitive | ((datum: Datum, index: number, outerIndex: number) => Primitive) }, priority?: string): Transition<Datum>;
styleTween(name: string, tween: (datum: Datum, index: number, attr: string) => Primitive, priority?: string): Transition<Datum>;
styleTween(name: string, tween: (datum: Datum, index: number, attr: string) => (t: number) => Primitive, priority?: string): Transition<Datum>;
text(value: Primitive): Transition<Datum>;
text(value: (datum: Datum, index: number, outerIndex: number) => Primitive): Transition<Datum>;
@@ -1 +0,0 @@