Branch: refs/heads/master
Home: https://github.com/pcbsd/pcbsd
Commit: 8516ff28c25fbaf3156d9627617933fa9620e6a1
https://github.com/pcbsd/pcbsd/commit/8516ff28c25fbaf3156d9627617933fa9620e6a1
Author: Ken Moore <ken at pcbsd.org>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M src-qt4/life-preserver/LPTray.cpp
M src-qt4/life-preserver/LPTray.h
M src-qt4/life-preserver/LPWatcher.cpp
M src-qt4/life-preserver/LPWatcher.h
Log Message:
-----------
Setup the LPTray to use the new LPWatcher class (untested yet)
Commit: 9ba89ba337339880e9c9cd4ba3a8e42030678f71
https://github.com/pcbsd/pcbsd/commit/9ba89ba337339880e9c9cd4ba3a8e42030678f71
Author: Ken Moore <ken at pcbsd.org>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M src-qt4/life-preserver/LPBackend.cpp
M src-qt4/life-preserver/LPWatcher.cpp
M src-sh/Makefile
M src-sh/lpreserver/lpreserver
M src-sh/pbi-manager/install.sh
M src-sh/pbi-manager/pbi-manager
A src-sh/pbi-manager10/INSTALL
A src-sh/pbi-manager10/Makefile
A src-sh/pbi-manager10/etc/pbi.conf
A src-sh/pbi-manager10/icons/default.png
A src-sh/pbi-manager10/icons/patch.png
A src-sh/pbi-manager10/install.sh
A src-sh/pbi-manager10/man1/pbi_add.1
A src-sh/pbi-manager10/man1/pbi_browser.1
A src-sh/pbi-manager10/man1/pbi_create.1
A src-sh/pbi-manager10/man1/pbi_delete.1
A src-sh/pbi-manager10/man1/pbi_icon.1
A src-sh/pbi-manager10/man1/pbi_indextool.1
A src-sh/pbi-manager10/man1/pbi_info.1
A src-sh/pbi-manager10/man1/pbi_listrepo.1
A src-sh/pbi-manager10/man1/pbi_metatool.1
A src-sh/pbi-manager10/man1/pbi_patch.1
A src-sh/pbi-manager10/man1/pbi_update.1
A src-sh/pbi-manager10/man1/pbi_update_hashdir.1
A src-sh/pbi-manager10/man5/pbi.conf.5
A src-sh/pbi-manager10/man8/pbi_addrepo.8
A src-sh/pbi-manager10/man8/pbi_autobuild.8
A src-sh/pbi-manager10/man8/pbi_deleterepo.8
A src-sh/pbi-manager10/man8/pbi_makepatch.8
A src-sh/pbi-manager10/man8/pbi_makeport.8
A src-sh/pbi-manager10/man8/pbi_makerepo.8
A src-sh/pbi-manager10/man8/pbid.8
A src-sh/pbi-manager10/mkport.sh
A src-sh/pbi-manager10/module-examples/convertoldmod.sh
A src-sh/pbi-manager10/module-examples/firefox/LICENSE
A src-sh/pbi-manager10/module-examples/firefox/external-links
A src-sh/pbi-manager10/module-examples/firefox/pbi.conf
A src-sh/pbi-manager10/module-examples/firefox/resources/firefox.png
A src-sh/pbi-manager10/module-examples/firefox/resources/gui_banner.png
A src-sh/pbi-manager10/module-examples/firefox/resources/gui_sidebanner.png
A src-sh/pbi-manager10/module-examples/firefox/scripts/post-install.sh
A src-sh/pbi-manager10/module-examples/firefox/scripts/post-portmake.sh
A src-sh/pbi-manager10/module-examples/firefox/scripts/pre-install.sh
A src-sh/pbi-manager10/module-examples/firefox/scripts/pre-remove.sh
A src-sh/pbi-manager10/module-examples/firefox/xdg-desktop/firefox.desktop
A src-sh/pbi-manager10/module-examples/firefox/xdg-menu/firefox3.desktop
A src-sh/pbi-manager10/module-examples/gimp/LICENSE
A src-sh/pbi-manager10/module-examples/gimp/external-links
A src-sh/pbi-manager10/module-examples/gimp/pbi.conf
A src-sh/pbi-manager10/module-examples/gimp/resources/gimp.png
A src-sh/pbi-manager10/module-examples/gimp/resources/gui_banner.png
A src-sh/pbi-manager10/module-examples/gimp/resources/gui_sidebanner.png
A src-sh/pbi-manager10/module-examples/gimp/scripts/post-install.sh
A src-sh/pbi-manager10/module-examples/gimp/scripts/post-portmake.sh
A src-sh/pbi-manager10/module-examples/gimp/scripts/pre-install.sh
A src-sh/pbi-manager10/module-examples/gimp/scripts/pre-portmake.sh
A src-sh/pbi-manager10/module-examples/gimp/scripts/pre-remove.sh
A src-sh/pbi-manager10/module-examples/gimp/xdg-desktop/gimp.desktop
A src-sh/pbi-manager10/module-examples/gimp/xdg-menu/gimp.desktop
A src-sh/pbi-manager10/module-examples/gimp/xdg-mime/gimp-xdg.png
A src-sh/pbi-manager10/module-examples/gimp/xdg-mime/gimp-xdg.xml
A src-sh/pbi-manager10/pbi-manager
A src-sh/pbi-manager10/port-files/Makefile
A src-sh/pbi-manager10/port-files/files/pkg-message.in
A src-sh/pbi-manager10/port-files/pkg-descr
A src-sh/pbi-manager10/port-files/pkg-plist
A src-sh/pbi-manager10/rc.d/ldpbiconfig
A src-sh/pbi-manager10/rc.d/pbid
A src-sh/pbi-manager10/repo/pcbsd.rpo
A src-sh/pbi-manager10/wrapper/Makefile
A src-sh/pbi-manager10/wrapper/example.pbiwrapper.ldhints
A src-sh/pbi-manager10/wrapper/example.pbiwrapper.pbiopt
A src-sh/pbi-manager10/wrapper/main.c
Log Message:
-----------
Merge branch 'master' of github.com:pcbsd/pcbsd
Conflicts:
src-qt4/life-preserver/LPWatcher.cpp
Compare: https://github.com/pcbsd/pcbsd/compare/651bd2812cbd...9ba89ba33733