Unity

Merge lp:~gordallott/unity/hud-include-correct-glib into lp:unity

  1. hud-include-correct-glib
  2. Merge into trunk
Proposed by Gord Allott on 2012-03-06
Status: Merged
Approved by: Gord Allott on 2012-03-06
Approved revision: 2053
Merged at revision: 2053
Proposed branch: lp:~gordallott/unity/hud-include-correct-glib
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
UnityCore/Hud.h (+1/-1)
To merge this branch: bzr merge lp:~gordallott/unity/hud-include-correct-glib
Reviewer Review Type Date Requested Status
Michał Sawicz Approve on 2012-03-06
Mirco Müller 2012-03-06 Pending
Review via email: mp+96083@code.launchpad.net

Description of the Change

UNBLOCK resolves a silly glib issue, glib is C not C++ ;)

To post a comment you must log in.
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/Hud.h'
2--- UnityCore/Hud.h 2012-01-12 13:56:31 +0000
3+++ UnityCore/Hud.h 2012-03-06 09:55:20 +0000
4@@ -24,7 +24,7 @@
5 #include <string>
6 #include <memory>
7 #include <NuxCore/Property.h>
8-#include <glib/gvariant.h>
9+#include <glib.h>
10
11 namespace unity
12 {