Skip to content
GitLab
Explore
Sign in
Graphics
Gwenview
Commits
adb03a84
Commit
adb03a84
authored
Mar 05, 2011
by
Aurélien Gâteau
Browse files
Merge branch 'master' into KDE/4.6
Brings FreeBSD memory fixes BUG:259671 Conflicts: lib/document/document.cpp
parents
d14ad605
e3674c35
Changes
5
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment