Enno Rehling
|
e6f3dc8b85
|
Merge branch 'master' into develop
Conflicts:
scripts/run-turn.lua
src/buildno.h
src/kernel/group.c
src/kernel/save.c
src/kernel/save.test.c
src/kernel/version.h
src/util/password.c
src/util/password.test.c
tests/run-turn.sh
|
2016-02-23 10:47:33 +01:00 |
|
Enno Rehling
|
c823a3b036
|
handle regions that have no owner
|
2016-02-22 20:47:06 +01:00 |
|
Enno Rehling
|
0189111876
|
update key attribute api
prepare to replace at_key. do not return the internals. add basic test.
|
2016-02-09 06:43:19 +01:00 |
|
Enno Rehling
|
64b84481b2
|
refactoring: move parsing and allies code out of config.c
|
2015-11-24 18:52:09 +01:00 |
|
Enno Rehling
|
ee02721c21
|
fix and tests for otherfaction attributes in E2
https://bugs.eressea.de/view.php?id=2152
|
2015-11-09 13:36:52 +01:00 |
|
Enno Rehling
|
c54cbfd472
|
fix copyright notice
|
2015-01-30 22:10:29 +01:00 |
|
Enno Rehling
|
abca25d1d5
|
fix indentation in every file
fix copyright date
remove vi ts=2 code
remove a couple of superfluous extern declarations
|
2015-01-30 20:37:14 +01:00 |
|
Enno Rehling
|
03c247c788
|
I am killing the core/ directory.
Lots of files are moving to a new location in src/
Some intersting CMake changes.
|
2014-02-18 05:45:00 +01:00 |
|