Skip to content

Commit

Permalink
Merge branch 'master' into playback-info
Browse files Browse the repository at this point in the history
Conflicts:
	Makefile
  • Loading branch information
Jim Porter committed Dec 28, 2014
2 parents 083c383 + 52ec5d3 commit 76322d7
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.pyc
plugin.video.giantbomb-*.zip

0 comments on commit 76322d7

Please sign in to comment.