~jannis-xfce/+junk/cliapp

Viewing all changes in revision 157.

  • Committer: Lars Wirzenius
  • Date: 2011-12-03 17:40:49 UTC
  • mfrom: (152.1.1 trunk)
  • Revision ID: liw@liw.fi-20111203174049-g2cyglnp2bl335ht
merge and fix conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: