Viewing all changes in revision 1931.
- Committer: Parker Coates
- Date: 2012-11-09 16:51:36 UTC
- mfrom: (1920.1.12)
- Revision ID: git-v1:ddd90af4af5189024ce5ad945115bf6b9f011df9
Merge 'KDE/4.9' back into 'master'.
Going forward, I would like to see all bug fixes happening in release
branches and then being merged back into master. Cherry-picking
and backports are ugly and should be avoided where possible.
This is my first time merging a remote branch, so we'll see how it
goes.
Going forward, I would like to see all bug fixes happening in release
branches and then being merged back into master. Cherry-picking
and backports are ugly and should be avoided where possible.
This is my first time merging a remote branch, so we'll see how it
goes.
- files modified:
- idiot.cpp
expand all
collapse all
added
removed
