Unity

Merge lp:~brandontschaefer/unity/quick-namespace-fix into lp:unity

  1. quick-namespace-fix
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Rejected
Rejected by: Andrea Azzarone
Proposed branch: lp:~brandontschaefer/unity/quick-namespace-fix
Merge into: lp:unity
Diff against target: 28 lines (+5/-5)
1 file modified
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+5/-5)
To merge this branch: bzr merge lp:~brandontschaefer/unity/quick-namespace-fix
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+86850@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp

Unmerged revisions

1798. By Brandon Schaefer

quick namespace fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
2--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp 2011-12-22 12:46:37 +0000
3+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp 2011-12-24 05:17:25 +0000
4@@ -24,10 +24,10 @@
5
6 COMPIZ_PLUGIN_20090315(unitymtgrabhandles, UnityMTGrabHandlesPluginVTable);
7
8-Unity::MT::GrabHandle::ImplFactory * Unity::MT::GrabHandle::ImplFactory::mDefault = NULL;
9+unity::MT::GrabHandle::ImplFactory * unity::MT::GrabHandle::ImplFactory::mDefault = NULL;
10
11-Unity::MT::GrabHandle::ImplFactory *
12-Unity::MT::GrabHandle::ImplFactory::Default()
13+unity::MT::GrabHandle::ImplFactory *
14+unity::MT::GrabHandle::ImplFactory::Default()
15 {
16 return mDefault;
17 }
18@@ -49,8 +49,8 @@
19 {
20 }
21
22-Unity::MT::GrabHandle::Impl *
23-Unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle)
24+unity::MT::GrabHandle::Impl *
25+unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle)
26 {
27 unity::MT::GrabHandle::Impl *impl = new X11GrabHandleImpl (mDpy, handle);
28 return impl;