aboutsummaryrefslogtreecommitdiffstats
path: root/server (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://git.animux.de/erlangAlexander Sulfrian2010-10-142-14/+21
|\
| * Fixed errorsMarco Ziener2010-10-141-2/+2
| * Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-141-1/+1
| |\
| | * minor bracket fixJakob Pfender2010-10-141-1/+1
| * | Fixed errorsMarco Ziener2010-10-141-2/+2
| |/
| * ImprovementsMarco Ziener2010-10-142-2/+14
| * ehm kaMichael Wittig2010-10-141-8/+3
* | added makefiles in the subdirsAlexander Sulfrian2010-10-141-0/+5
|/
* Random ImprovementsMarco Ziener2010-10-141-2/+18
* Merge branch 'master' of ssh://git.animux.de/erlangAlexander Sulfrian2010-10-141-10/+3
|\
| * Merge branch 'master' of ssh://git.animux.de/erlangMichael Wittig2010-10-141-2/+2
| |\
| | * Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-142-8/+19
| | |\
| | * | Locking added~Marco Ziener2010-10-141-2/+2
| * | | search_bestMichael Wittig2010-10-141-8/+1
| | |/ | |/|
* | | code cleanupAlexander Sulfrian2010-10-141-28/+16
* | | added error messageAlexander Sulfrian2010-10-141-2/+2
|/ /
* | 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-141-13/+12
|\
| * fixed errorsAlexander Sulfrian2010-10-141-13/+12
* | MerMarco Ziener2010-10-141-2/+3
|/
* mergedMarco Ziener2010-10-141-0/+13
|\
| * Merge branch 'master' of ssh://git.animux.de/erlangMichael Wittig2010-10-141-6/+19
| |\
| * | medaa server DB initmicha2010-10-141-2/+14
* | | SomethingMarco Ziener2010-10-141-6/+30
| |/ |/|
* | Merge branch 'master' of ssh://git.animux.de/erlangJakob Pfender2010-10-141-6/+6
|\ \
| * | removed name in server moduleAlexander Sulfrian2010-10-141-6/+6
| |/
* / client-side votingJakob Pfender2010-10-141-0/+13
|/
* progressAlexander Sulfrian2010-10-142-13/+30
* some progressAlexander Sulfrian2010-10-132-3/+14
* 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-131-16/+0
* moved server to common (used from server and client)Alexander Sulfrian2010-10-131-45/+0
* fixed media playermicha2010-10-131-4/+3
* Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-132-6/+12
|\
| * some progressAlexander Sulfrian2010-10-132-6/+12
* | MediaMarco Ziener2010-10-131-3/+3
* | Merge branch 'master' of ssh://git.animux.de/erlangMarco Ziener2010-10-132-4/+21
|/