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

Conflicts:
	src/servers/app/ServerWindow.cpp

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

..

artwork

Updated HVIF icons relating to PDFs.

2012-07-30 08:15:37 +00:00

bin

Removed dead code.

2012-06-17 16:29:38 -04:00

boot_cd

…

catalogs

Update translations from Pootle

2012-08-16 06:23:58 +02:00

common

Fix ticket #8858.

2012-08-11 09:56:20 -04:00

config/boot

…

develop

…

etc

Adjust /bin/locale to print time-related locale, too.

2012-02-23 23:15:36 +01:00

image_directories

…

settings

…

system

Merge branch 'master' into x86_64

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