Enno Rehling
|
e937749475
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
src/kernel/faction.c
|
2015-01-11 01:25:10 +01:00 |
|
Enno Rehling
|
60e2e23414
|
Merge branch 'master' of github.com:eressea/server
Conflicts:
s/cron/previews.sh
|
2015-01-09 20:50:43 +01:00 |
|
Enno Rehling
|
880b965c54
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
|
2014-12-28 17:29:34 +01:00 |
|
Enno Rehling
|
ab71860224
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
src/vortex.test.c
|
2014-12-12 17:24:00 +01:00 |
|
Enno Rehling
|
a5f14e7f02
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
|
2014-11-16 12:55:58 +01:00 |
|
Enno Rehling
|
9c0a7c0e2e
|
Merge branch 'version-3-3'
Conflicts:
src/build.h
|
2014-11-08 22:56:53 +01:00 |
|
Enno Rehling
|
367307575c
|
Merge branch 'master' of github.com:eressea/server
|
2014-11-01 22:12:11 +01:00 |
|
Enno Rehling
|
81bfb598d0
|
refactoring modules, cleaning out the config.c kitchen sink.
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
|
2014-11-01 12:09:56 +01:00 |
|