following e97c62ffc0 resolved merge conflict

2013-02-27 03:53:40 +01:00

..

nodetext

first init

2012-05-09 20:05:43 +02:00

.cvsignore

first init

2012-05-09 20:05:43 +02:00

.htaccess

first init

2012-05-09 20:05:43 +02:00

index.html

first init

2012-05-09 20:05:43 +02:00

locale.inc.php

nicer header line display

2013-02-27 03:11:00 +01:00

settings-dev.inc.php

layout fixes

2013-02-25 01:40:49 +01:00

settings-dist.inc.php

nicer header line display

2013-02-27 03:11:00 +01:00

settings-sample.inc.php

updates source code license and xml docu

2012-08-16 21:04:13 +02:00

sqlroot-dist.inc.php

updates source code license and xml docu

2012-08-16 21:04:13 +02:00