← Back to branch summary

~azzar1/unity/lp-1154364

« back to all changes in this revision

Viewing changes to UnityCore/Preview.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
UnityCore/Preview.cpp
177
177
      actions_list_.push_back(std::make_shared<Action>(
178
178
            raw_action->id, raw_action->display_name,
179
179
            raw_action->icon_hint,
180
 
            static_cast<LayoutHint>(raw_action->layout_hint)));
 
180
            static_cast<LayoutHint>(raw_action->layout_hint),
 
181
            raw_action->hints));
181
182
    }
182
183
    
183
184
    int info_hints_len;