← Back to branch summary

~tsbarnes/indicator-keylock/trunk

Viewing all changes in revision 106.

  • Committer: T. Scott Barnes
  • Date: 2015-09-22 00:55:04 UTC
  • mfrom: (0.1.100 indicator-keylock)
  • Revision ID: scott@awesomebarnes.com-20150922005504-hp34c7me1t3knnrc
Merge remote-tracking branch 'origin/master'

Conflicts:
        INSTALL
        configure.ac
        debian/changelog
        debian/control
        pixmaps/Makefile.am
        po/indicator-keylock.pot

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: