hdt: fix conflict
[profile/ivi/syslinux.git] / com32 / hdt / hdt-cli-pxe.c
2009-04-23 Erwan VeluMerge branch 'master' of git://git./boot/syslinux/sysli...
2009-04-23 Pierre-Alexandre... Merge commit 'mouraf/for-erwan' into for-erwan
2009-04-17 Pierre-Alexandre... Merge commit 'erwan/master' into for-erwan
2009-04-17 Pierre-Alexandre... hdt: Get rid of nb_modules in struct cli_module_descr
2009-04-16 Erwan Veluhdt: Improving more_printf & clear_screen management
2009-04-16 Erwan VeluMerge branch 'master' of git://git./boot/syslinux/sysli...
2009-04-15 Erwan VeluMerge branch 'master' of git://git./boot/syslinux/syslinux
2009-04-11 Pierre-Alexandre... Merge branch 'master' into for-erwan
2009-04-11 Erwan VeluMerge branch 'for-erwan' of ssh://erwan@terminus.zytor...
2009-04-11 Pierre-Alexandre... Merge commit 'hdt-erwan/master' into for-erwan
2009-03-26 Erwan Veluhdt: Pxe mode might generate corruption
2009-03-25 Erwan VeluMerge branch 'erwan'
2009-03-25 Erwan Veluhdt: Pxe mode might generate corruption
2009-03-22 Erwan VeluMerge branch 'master' into pierre
2009-03-22 Pierre-Alexandre... Merge commit 'erwan-private/master' into for-erwan
2009-03-22 Pierre-Alexandre... hdt: Make PXE module use the new framework
2009-03-22 Pierre-Alexandre... hdt: Implement show commands (hdt mode) with the new...
2009-03-17 H. Peter AnvinMerge branch 'master' into memdisk-cd
2009-03-16 H. Peter AnvinMerge commit 'hdt/master' syslinux-3.74-pre6
2009-03-15 Erwan VeluMerge branch 'master' of git://git./boot/syslinux/syslinux
2009-03-14 Pierre-Alexandre... hdt: Make pxe_show static
2009-03-14 Pierre-Alexandre... hdt: Remove unused parameter in main_show_pxe
2009-03-14 Pierre-Alexandre... hdt: Remove unused parameter in handle_pxe_commands
2009-03-14 Pierre-Alexandre... hdt: Make show_pxe_help static
2009-03-14 Pierre-Alexandre... hdt: Fix indentation in source files
2009-03-13 H. Peter AnvinMerge branch 'hdt'
2009-03-09 erwanhdt: fixing wrong PXELINUX checks
2009-03-08 erwanhdt: preventing pxe mode being reach w/o pxelinux
2009-03-07 erwanImproving help
2009-03-02 H. Peter AnvinMerge branch 'master' into hdt
2009-02-27 H. Peter AnvinMerge branch 'master' into hdt
2009-02-26 Erwan Veluhdt: Adding mac & ip adress detection
2009-02-26 Erwan Veluhdt: Renaming cli-net to cli-pxe Moving hardware initia...