Permalink
Switch branches/tags
Nothing to show
Commits on Apr 28, 2016
  1. Merge pull request #62 from aplatanado/alternative-system-dir

    Alternative system dir
    committed Apr 28, 2016
Commits on Aug 6, 2015
  1. Merge https://github.com/helmuthdu/conky_colors into alternative-syst…

    …em-dir
    
    Conflicts:
    	Makefile
    aplatanado committed Aug 6, 2015
  2. Merge branch 'alternative-system-dir' of github.com:aplatanado/conky_…

    …colors into alternative-system-dir
    aplatanado committed Aug 6, 2015
  3. Merge pull request #61 from aplatanado/fix-file-permissions

    Change Makefile install rule to always set the right permissions during installation
    committed Aug 6, 2015
  4. Merge pull request #60 from aplatanado/fix-nvidia-double-values

    The values for Nvidia are shown twice
    committed Aug 6, 2015
Commits on Nov 3, 2014
  1. Merge pull request #56 from hongquan/master

    Fix not recognize root filesystem. Ignore /boot/efi.
    committed Nov 3, 2014
Commits on Oct 5, 2014
  1. Merge pull request #55 from hongquan/master

    Format README with Markdown.
    committed Oct 5, 2014
  2. Format README with Markdown.

    hongquan committed Oct 5, 2014
Commits on May 28, 2014
  1. Merge pull request #53 from faux123/master

    GCC 4.8.x compilation warning fixup for latest ubuntu LTS 14.04
    committed May 28, 2014
Commits on May 27, 2014
  1. src/themes.c: GCC 4.8.x fix up

    Signed-off-by: Paul Reioux <reioux@gmail.com>
    faux123 committed May 27, 2014
  2. src/options.c: GCC 4.8.x fix up

    Signed-off-by: Paul Reioux <reioux@gmail.com>
    faux123 committed May 27, 2014
Commits on Jan 16, 2014
  1. Merge pull request #50 from subdee/master

    Greek translations
    committed Jan 16, 2014
Commits on Jan 15, 2014
  1. Add greek to help text

    subdee committed Jan 15, 2014
  2. Update Greek translation

    subdee committed Jan 15, 2014
  3. Add Greek translation

    subdee committed Jan 15, 2014
Commits on Jul 15, 2013
  1. organized the language options

    committed Jul 15, 2013
  2. Merge pull request #46 from frantisekz/master

    Czech language fix
    committed Jul 15, 2013
Commits on Jul 12, 2013
  1. new processes icons

    committed Jul 12, 2013
  2. bugfixes

    committed Jul 12, 2013
  3. improviments in the hd scripts

    committed Jul 12, 2013
Commits on Jul 11, 2013
  1. Czech language fix

    frantisekz committed Jul 11, 2013
  2. fixed a bug in conkyHD2.py

    committed Jul 11, 2013
Commits on Jul 9, 2013