~oif-team/frame/1.1.4

Viewing all changes in revision 40.

  • Committer: Chase Douglas
  • Date: 2011-08-09 20:13:14 UTC
  • mfrom: (39.1.2 utouch-frame)
  • Revision ID: chase.douglas@ubuntu.com-20110809201314-4y2bec8yj245lwcq
Merge resolution fix and unused variable removal

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: