aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://git.animux.de/erlangMichael Wittig2010-10-142-2/+3
|\
| * Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-143-8/+20
| |\
| | * ignored mnesia databaseAlexander Sulfrian2010-10-141-0/+1
| * | Locking added~Marco Ziener2010-10-141-2/+2
* | | search_bestMichael Wittig2010-10-141-8/+1
| |/ |/|
* | Merge branch 'master' of ssh://git.animux.de/erlangMichael Wittig2010-10-143-21/+72
|\ \
| * | added media:initAlexander Sulfrian2010-10-141-0/+2
| |/
| * Errors fixedMarco Ziener2010-10-141-5/+8
| * Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-142-16/+36
| |\
| | * implemented some functions on the serverAlexander Sulfrian2010-10-141-13/+33
| | * 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
| | |/ | |/|
* / | search_bestMichael Wittig2010-10-141-9/+18
|/ /
* / 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
* Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-143-101/+47
|\
| * fixed typoAlexander Sulfrian2010-10-141-1/+1
| * removed code duplicationAlexander Sulfrian2010-10-141-26/+8
| * fixed errorsAlexander Sulfrian2010-10-142-35/+62
| * removed obsolete filesAlexander Sulfrian2010-10-141-63/+0
* | MerMarco Ziener2010-10-141-2/+3
|/
* mergedMarco Ziener2010-10-142-1/+14
|\
| * Merge branch 'master' of ssh://git.animux.de/erlangMichael Wittig2010-10-143-50/+88
| |\
| | * 'server is unboun' fixedJakob Pfender2010-10-141-1/+1
| * | medaa server DB initmicha2010-10-141-2/+14
* | | SomethingMarco Ziener2010-10-141-6/+30
* | | Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-143-50/+88
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://git.animux.de/erlangJakob Pfender2010-10-143-50/+45
| |\ \
| | * | removed name in server moduleAlexander Sulfrian2010-10-143-50/+45
| | |/
| * / client-side votingJakob Pfender2010-10-142-0/+43
| |/
* / Updated mediamoduleMarco Ziener2010-10-141-0/+63
|/
* progressAlexander Sulfrian2010-10-144-83/+109
* some progressAlexander Sulfrian2010-10-133-18/+89
* added code:load_abs mechanism to be able to load common moduleAlexander Sulfrian2010-10-131-0/+2
* added start script for serverAlexander Sulfrian2010-10-131-0/+3
* new global makefileAlexander Sulfrian2010-10-133-32/+23
* moved server to common (used from server and client)Alexander Sulfrian2010-10-132-45/+49
* fixed media playermicha2010-10-131-4/+3
* Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-133-6/+43
|\
| * some progressAlexander Sulfrian2010-10-133-6/+43
* | MediaMarco Ziener2010-10-131-3/+3
* | Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-139-0/+119
|\|
| * added some modules for serverAlexander Sulfrian2010-10-133-0/+87
| * added makefilesAlexander Sulfrian2010-10-132-0/+32
| * changed repository layoutAlexander Sulfrian2010-10-134-0/+0
* | ChangesMarco Ziener2010-10-132-4/+21
|/
* code cleanupAlexander Sulfrian2010-10-132-16/+13