Commit 6b93c568 authored 16 years ago by Jérémy Quentin

Merge branch 'master' into qt-client

Conflicts:
	src/dbus/configurationmanager-glue.h

Branches

No related tags found

No related merge requests found

Showing with 153 additions and 1634 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment