aboutsummaryrefslogtreecommitdiffstats
path: root/server/media.erl (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-141-8/+17
|\
| * Merge branch 'master' of ssh://git.animux.de/erlangMichael Wittig2010-10-141-8/+37
| |\
| * | search_bestMichael Wittig2010-10-141-9/+18
* | | Locking added~Marco Ziener2010-10-141-2/+2
| |/ |/|
* | Errors fixedMarco Ziener2010-10-141-5/+8
* | Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-141-3/+3
|\ \
| * | fix database creationAlexander Sulfrian2010-10-141-1/+1
| * | Merge branch 'master' of ssh://git.animux.de/erlangAlexander Sulfrian2010-10-141-8/+14
| |\|
| * | removed trailing whitespacesAlexander Sulfrian2010-10-141-4/+3
* | | Additional ServerfuMarco Ziener2010-10-141-6/+32
| |/ |/|
* | ahh push it, push it real goodMichael Wittig2010-10-141-9/+14
|/
* runloop and wait on song end implementedMichael Wittig2010-10-141-2/+16
* media server fixed playingMichael Wittig2010-10-141-1/+1
* MerMarco Ziener2010-10-141-2/+3
* mergedMarco Ziener2010-10-141-0/+13
|\
| * medaa server DB initmicha2010-10-141-2/+14
* | SomethingMarco Ziener2010-10-141-6/+30
|/
* fixed media playermicha2010-10-131-4/+3
* MediaMarco Ziener2010-10-131-3/+3
* Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-131-2/+19
* changed repository layoutAlexander Sulfrian2010-10-131-0/+46