Merge branch 'devkit-power'
Conflicts: data/interfaces/xfpm-settings.ui src/Makefile.am src/xfpm-brightness-hal.c src/xfpm-engine.c src/xfpm-supply.c src/xfpm-tray-icon.c
Showing
- INSTALL 80 additions, 17 deletionsINSTALL
- Makefile.am 7 additions, 1 deletionMakefile.am
- README 4 additions, 1 deletionREADME
- TODO 4 additions, 5 deletionsTODO
- common/Makefile.am 27 additions, 0 deletionscommon/Makefile.am
- common/xfpm-brightness.c 685 additions, 0 deletionscommon/xfpm-brightness.c
- common/xfpm-brightness.h 85 additions, 0 deletionscommon/xfpm-brightness.h
- common/xfpm-common.c 35 additions, 1 deletioncommon/xfpm-common.c
- common/xfpm-common.h 7 additions, 0 deletionscommon/xfpm-common.h
- common/xfpm-debug.c 44 additions, 16 deletionscommon/xfpm-debug.c
- common/xfpm-debug.h 27 additions, 15 deletionscommon/xfpm-debug.h
- common/xfpm-icons.h 9 additions, 0 deletionscommon/xfpm-icons.h
- configure.ac.in 51 additions, 11 deletionsconfigure.ac.in
- data/icons/128x128/Makefile.am 1 addition, 0 deletionsdata/icons/128x128/Makefile.am
- data/icons/128x128/devices/Makefile.am 7 additions, 0 deletionsdata/icons/128x128/devices/Makefile.am
- data/icons/128x128/devices/processor.png 0 additions, 0 deletionsdata/icons/128x128/devices/processor.png
- data/icons/16x16/Makefile.am 2 additions, 0 deletionsdata/icons/16x16/Makefile.am
- data/icons/16x16/actions/Makefile.am 8 additions, 0 deletionsdata/icons/16x16/actions/Makefile.am
- data/icons/16x16/actions/xfpm-hibernate.png 0 additions, 0 deletionsdata/icons/16x16/actions/xfpm-hibernate.png
- data/icons/16x16/actions/xfpm-suspend.png 0 additions, 0 deletionsdata/icons/16x16/actions/xfpm-suspend.png
Loading
Please register or sign in to comment