~elementary-design/egtk/3-14

Viewing all changes in revision 412.

  • Committer: Daniel Foré
  • Date: 2015-01-15 21:12:14 UTC
  • mfrom: (291.1.99 egtk)
  • Revision ID: daniel@elementaryos.org-20150115211214-f8s523u9okc9nunh
attempt to resolve conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: