Skip to content

Commit

Permalink
Merge branch 'master' into chore-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
jayphelps authored Oct 24, 2016
2 parents bce288f + ece1b89 commit 2aff0ef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ For Mac OS X with [Homebrew](http://brew.sh/):
- `brew install imagemagick`
- `brew install graphicsmagick`
- `brew install ghostscript`
- You may need to install the Ghostscript fonts manually:
- Download the tarball from the [gs-fonts project](https://sourceforge.net/projects/gs-fonts)
- `mkdir -p /usr/local/share/ghostscript && tar zxvf /path/to/ghostscript-fonts.tar.gz -C /usr/local/share/ghostscript`

For Debian Linux:

Expand Down
2 changes: 1 addition & 1 deletion src/operator/do.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import { TeardownLogic } from '../Subscription';
* @owner Observable
*/
/* tslint:disable:max-line-length */
export function _do<T>(next: (x: T) => void, error?: (e: any) => void, complete?: (this: Observable<T>) => void): Observable<T>;
export function _do<T>(this: Observable<T>, next: (x: T) => void, error?: (e: any) => void, complete?: () => void): Observable<T>;
export function _do<T>(this: Observable<T>, observer: PartialObserver<T>): Observable<T>;
/* tslint:disable:max-line-length */
export function _do<T>(this: Observable<T>, nextOrObserver?: PartialObserver<T> | ((x: T) => void),
Expand Down

0 comments on commit 2aff0ef

Please sign in to comment.