christos 04eef3cfd2 resolve conflicts, fix build.		2008-08-30 12:16:51 +00:00
..
magdir	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00
Header	…
Localstuff	…
Makefile.am	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00
Makefile.in	resolve conflicts, fix build.	2008-08-30 12:16:51 +00:00