Alex Smith e688bf23d4 Merge branch 'master' into x86_64 ...

Conflicts:
	src/servers/app/ServerWindow.cpp

2012-08-16 21:11:15 +01:00

..

boot

Added some of the development optional packages.

2012-08-16 20:32:29 +01:00

data

Added a Public Domain generic text file.

2012-08-05 20:06:20 +00:00