Skip to content
This repository has been archived by the owner on Feb 9, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:ps3mediaserver/ps3mediaserver
Browse files Browse the repository at this point in the history 
Conflicts:
	src/main/external-resources/PMS.conf
  • Loading branch information
@ikarsokolov
ikarsokolov committed Jul 21, 2012
2 parents 4d5ea66 + de8704e commit 2e2e596
Show file tree
Hide file tree
Showing 3 changed files with 195 additions and 133 deletions.
Loading

0 comments on commit 2e2e596

Please sign in to comment.