Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # CHANGELOG.md # README.md # build/app.module.js # build/app.module.js.map # build/app/app.component.css # build/app/app.component.js # build/app/app.component.js.map # build/app/app.component.metadata.json # build/app/mdl.js # build/app/mdl.js.map # build/lib/pdfjs-dist/bower.json # build/lib/pdfjs-dist/build/pdf.combined.js # build/lib/pdfjs-dist/build/pdf.js # build/lib/pdfjs-dist/build/pdf.min.js # build/lib/pdfjs-dist/build/pdf.worker.js # build/lib/pdfjs-dist/build/pdf.worker.min.js # build/lib/pdfjs-dist/package.json # build/lib/pdfjs-dist/web/compatibility.js # build/lib/pdfjs-dist/web/pdf_viewer.js # build/lib/reflect-metadata/Reflect.js # build/lib/rxjs/Observable.js.map # build/lib/rxjs/Rx.js.map # build/lib/rxjs/Subject.js.map # build/lib/rxjs/Subscription.d.ts # build/lib/rxjs/Subscription.js # build/lib/rxjs/Subscription.js.map # build/lib/rxjs/bundles/Rx.js # build/lib/rxjs/bundles/Rx.min.js # build/lib/rxjs/bundles/Rx.min.js.map # build/lib/rxjs/observable/BoundCallbackObservable.d.ts # build/lib/rxjs/observable/BoundCallbackObservable.js.map # build/lib/rxjs/observable/BoundNodeCallbackObservable.d.ts # build/lib/rxjs/observable/BoundNodeCallbackObservable.js.map # build/lib/rxjs/observable/ConnectableObservable.js.map # build/lib/rxjs/observable/ErrorObservable.d.ts # build/lib/rxjs/observable/ErrorObservable.js.map # build/lib/rxjs/observable/ForkJoinObservable.js.map # build/lib/rxjs/observable/FromObservable.js.map # build/lib/rxjs/observable/IteratorObservable.js.map # build/lib/rxjs/observable/combineLatest.js # build/lib/rxjs/observable/combineLatest.js.map # build/lib/rxjs/observable/dom/AjaxObservable.js.map # build/lib/rxjs/observable/dom/WebSocketSubject.d.ts # build/lib/rxjs/observable/dom/WebSocketSubject.js # build/lib/rxjs/observable/dom/WebSocketSubject.js.map # build/lib/rxjs/operator/bufferCount.js # build/lib/rxjs/operator/bufferCount.js.map # build/lib/rxjs/operator/bufferTime.js # build/lib/rxjs/operator/bufferTime.js.map # build/lib/rxjs/operator/catch.js # build/lib/rxjs/operator/catch.js.map # build/lib/rxjs/operator/combineLatest.js # build/lib/rxjs/operator/combineLatest.js.map # build/lib/rxjs/operator/concat.js # build/lib/rxjs/operator/concat.js.map # build/lib/rxjs/operator/concatAll.js # build/lib/rxjs/operator/concatAll.js.map # build/lib/rxjs/operator/concatMap.js # build/lib/rxjs/operator/concatMap.js.map # build/lib/rxjs/operator/concatMapTo.js # build/lib/rxjs/operator/concatMapTo.js.map # build/lib/rxjs/operator/defaultIfEmpty.js # build/lib/rxjs/operator/defaultIfEmpty.js.map # build/lib/rxjs/operator/delay.js.map # build/lib/rxjs/operator/distinct.d.ts # build/lib/rxjs/operator/distinct.js # build/lib/rxjs/operator/distinctUntilChanged.js # build/lib/rxjs/operator/distinctUntilChanged.js.map # build/lib/rxjs/operator/distinctUntilKeyChanged.js # build/lib/rxjs/operator/distinctUntilKeyChanged.js.map # build/lib/rxjs/operator/do.js # build/lib/rxjs/operator/do.js.map # build/lib/rxjs/operator/every.d.ts # build/lib/rxjs/operator/every.js # build/lib/rxjs/operator/exhaust.js.map # build/lib/rxjs/operator/exhaustMap.js # build/lib/rxjs/operator/exhaustMap.js.map # build/lib/rxjs/operator/expand.js # build/lib/rxjs/operator/expand.js.map # build/lib/rxjs/operator/filter.js # build/lib/rxjs/operator/filter.js.map # build/lib/rxjs/operator/find.js # build/lib/rxjs/operator/find.js.map # build/lib/rxjs/operator/first.js # build/lib/rxjs/operator/groupBy.js # build/lib/rxjs/operator/groupBy.js.map # build/lib/rxjs/operator/last.js # build/lib/rxjs/operator/last.js.map # build/lib/rxjs/operator/max.d.ts # build/lib/rxjs/operator/max.js # build/lib/rxjs/operator/merge.js # build/lib/rxjs/operator/merge.js.map # build/lib/rxjs/operator/mergeAll.js.map # build/lib/rxjs/operator/mergeMap.js # build/lib/rxjs/operator/mergeMap.js.map # build/lib/rxjs/operator/mergeMapTo.js # build/lib/rxjs/operator/mergeMapTo.js.map # build/lib/rxjs/operator/min.d.ts # build/lib/rxjs/operator/min.js # build/lib/rxjs/operator/min.js.map # build/lib/rxjs/operator/multicast.js # build/lib/rxjs/operator/multicast.js.map # build/lib/rxjs/operator/observeOn.d.ts # build/lib/rxjs/operator/observeOn.js # build/lib/rxjs/operator/observeOn.js.map # build/lib/rxjs/operator/onErrorResumeNext.js.map # build/lib/rxjs/operator/publish.js # build/lib/rxjs/operator/publish.js.map # build/lib/rxjs/operator/race.js # build/lib/rxjs/operator/race.js.map # build/lib/rxjs/operator/reduce.d.ts # build/lib/rxjs/operator/reduce.js # build/lib/rxjs/operator/reduce.js.map # build/lib/rxjs/operator/repeat.d.ts # build/lib/rxjs/operator/repeat.js # build/lib/rxjs/operator/repeat.js.map # build/lib/rxjs/operator/repeatWhen.d.ts # build/lib/rxjs/operator/repeatWhen.js # build/lib/rxjs/operator/repeatWhen.js.map # build/lib/rxjs/operator/retry.js.map # build/lib/rxjs/operator/retryWhen.d.ts # build/lib/rxjs/operator/retryWhen.js # build/lib/rxjs/operator/retryWhen.js.map # build/lib/rxjs/operator/scan.js # build/lib/rxjs/operator/scan.js.map # build/lib/rxjs/operator/single.js.map # build/lib/rxjs/operator/startWith.js # build/lib/rxjs/operator/startWith.js.map # build/lib/rxjs/operator/subscribeOn.d.ts # build/lib/rxjs/operator/subscribeOn.js # build/lib/rxjs/operator/switchMap.js # build/lib/rxjs/operator/switchMap.js.map # build/lib/rxjs/operator/switchMapTo.js # build/lib/rxjs/operator/switchMapTo.js.map # build/lib/rxjs/operator/timeout.js # build/lib/rxjs/operator/timeout.js.map # build/lib/rxjs/operator/timeoutWith.js # build/lib/rxjs/operator/timeoutWith.js.map # build/lib/rxjs/operator/toPromise.js # build/lib/rxjs/operator/toPromise.js.map # build/lib/rxjs/operator/windowTime.d.ts # build/lib/rxjs/operator/windowTime.js # build/lib/rxjs/operator/windowTime.js.map # build/lib/rxjs/operator/withLatestFrom.js # build/lib/rxjs/operator/withLatestFrom.js.map # build/lib/rxjs/operator/zip.js # build/lib/rxjs/operator/zip.js.map # build/lib/rxjs/package.json # build/lib/rxjs/scheduler/VirtualTimeScheduler.d.ts # build/lib/rxjs/scheduler/VirtualTimeScheduler.js # build/lib/rxjs/scheduler/VirtualTimeScheduler.js.map # build/lib/rxjs/src/Subscription.ts # build/lib/rxjs/src/observable/BoundCallbackObservable.ts # build/lib/rxjs/src/observable/BoundNodeCallbackObservable.ts # build/lib/rxjs/src/observable/ErrorObservable.ts # build/lib/rxjs/src/observable/FromObservable.ts # build/lib/rxjs/src/observable/combineLatest.ts # build/lib/rxjs/src/observable/dom/WebSocketSubject.ts # build/lib/rxjs/src/operator/bufferCount.ts # build/lib/rxjs/src/operator/bufferTime.ts # build/lib/rxjs/src/operator/catch.ts # build/lib/rxjs/src/operator/combineLatest.ts # build/lib/rxjs/src/operator/concat.ts # build/lib/rxjs/src/operator/concatAll.ts # build/lib/rxjs/src/operator/concatMap.ts # build/lib/rxjs/src/operator/concatMapTo.ts # build/lib/rxjs/src/operator/defaultIfEmpty.ts # build/lib/rxjs/src/operator/distinct.ts # build/lib/rxjs/src/operator/distinctUntilChanged.ts # build/lib/rxjs/src/operator/distinctUntilKeyChanged.ts # build/lib/rxjs/src/operator/do.ts # build/lib/rxjs/src/operator/every.ts # build/lib/rxjs/src/operator/exhaustMap.ts # build/lib/rxjs/src/operator/expand.ts # build/lib/rxjs/src/operator/filter.ts # build/lib/rxjs/src/operator/find.ts # build/lib/rxjs/src/operator/groupBy.ts # build/lib/rxjs/src/operator/last.ts # build/lib/rxjs/src/operator/materialize.ts # build/lib/rxjs/src/operator/max.ts # build/lib/rxjs/src/operator/merge.ts # build/lib/rxjs/src/operator/mergeMap.ts # build/lib/rxjs/src/operator/mergeMapTo.ts # build/lib/rxjs/src/operator/min.ts # build/lib/rxjs/src/operator/multicast.ts # build/lib/rxjs/src/operator/observeOn.ts # build/lib/rxjs/src/operator/publish.ts # build/lib/rxjs/src/operator/race.ts # build/lib/rxjs/src/operator/reduce.ts # build/lib/rxjs/src/operator/repeat.ts # build/lib/rxjs/src/operator/repeatWhen.ts # build/lib/rxjs/src/operator/retryWhen.ts # build/lib/rxjs/src/operator/scan.ts # build/lib/rxjs/src/operator/startWith.ts # build/lib/rxjs/src/operator/subscribeOn.ts # build/lib/rxjs/src/operator/switchMap.ts # build/lib/rxjs/src/operator/switchMapTo.ts # build/lib/rxjs/src/operator/timeout.ts # build/lib/rxjs/src/operator/timeoutWith.ts # build/lib/rxjs/src/operator/toPromise.ts # build/lib/rxjs/src/operator/windowTime.ts # build/lib/rxjs/src/operator/withLatestFrom.ts # build/lib/rxjs/src/operator/zip.ts # build/lib/rxjs/src/scheduler/VirtualTimeScheduler.ts # build/lib/rxjs/src/symbol/iterator.ts # build/lib/rxjs/src/util/subscribeToResult.ts # build/lib/rxjs/symbol/iterator.d.ts # build/lib/rxjs/symbol/iterator.js # build/lib/rxjs/symbol/iterator.js.map # build/lib/rxjs/util/subscribeToResult.js # build/lib/rxjs/util/subscribeToResult.js.map # build/lib/systemjs/dist/system.src.js # build/lib/zone.js/dist/long-stack-trace-zone.js # build/lib/zone.js/dist/mocha-patch.js # build/lib/zone.js/dist/webapis-media-query.js # build/lib/zone.js/dist/webapis-notification.js # build/lib/zone.js/dist/zone-node.js # build/lib/zone.js/dist/zone.js # build/lib/zone.js/dist/zone.min.js # build/main.js # build/main.js.map # build/pdf-viewer/index.js # build/pdf-viewer/index.js.map # build/pdf-viewer/pdf-viewer.component.d.ts # build/pdf-viewer/pdf-viewer.component.js # build/pdf-viewer/pdf-viewer.component.js.map # build/pdf-viewer/pdf-viewer.component.metadata.json # dist/pdf-viewer.component.d.ts # dist/pdf-viewer.component.js # dist/pdf-viewer.component.metadata.json # package.json # src/app/app.component.css # src/app/app.component.ts # src/pdf-viewer/pdf-viewer.component.ts # tslint.json
- Loading branch information