Merge lp://staging/~valorie-zimmerman/kubuntu-docs/valorieEdits into lp://staging/kubuntu-docs/oneiric

Proposed by Valorie Zimmerman
Status: Needs review
Proposed branch: lp://staging/~valorie-zimmerman/kubuntu-docs/valorieEdits
Merge into: lp://staging/kubuntu-docs/oneiric
Diff against target: 160 lines (+43/-4) (has conflicts)
4 files modified
docs/desktop/C/desktop.xml (+30/-2)
docs/games/C/games.xml (+7/-0)
docs/graphics/C/graphics.xml (+2/-2)
docs/index/C/index.xml (+4/-0)
Text conflict in docs/desktop/C/desktop.xml
Text conflict in docs/games/C/games.xml
Text conflict in docs/index/C/index.xml
To merge this branch: bzr merge lp://staging/~valorie-zimmerman/kubuntu-docs/valorieEdits
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+75496@code.staging.launchpad.net

Description of the change

fixed ref to kpackagekit

To post a comment you must log in.

Unmerged revisions

235. By Valorie Zimmerman

fixed ref. to OpenOffice.org and Kpackagekit

234. By Valorie Zimmerman

fixed ref to Kpackagekit

233. By Valorie Zimmerman

fixed ref to Kpackagekit

232. By Valorie Zimmerman

Soooo many changes! Updated to 11.10.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches