Alex Staroselsky 74a3e8c937 Resolving merge conflicts as part of pull request #9826 for updates to IDialogOptions, IPromptDialog, and IPanelConfig"

2016-06-26 18:49:54 -05:00

..

angular-material-0.8.3.d.ts

Merge branch 'master' into rename-repo-url

2016-03-17 21:06:54 +09:00

angular-material-0.9.0.d.ts

Merge branch 'master' into rename-repo-url

2016-03-17 21:06:54 +09:00

angular-material-tests.ts

Updated IDialogOptions to include contentElement property for prerendered dialogs. Updated IPromptDialog to add initialValue method. Adding missing semicolon to IPanelConfig.

2016-06-26 18:45:07 -05:00

angular-material.d.ts

Resolving merge conflicts as part of pull request #9826 for updates to IDialogOptions, IPromptDialog, and IPanelConfig"

2016-06-26 18:49:54 -05:00