ico: Changes to 'master'

[Alan Coopersmith]

 ico.c       |   67 +++++++++++++++++++++++++++++++-----------------------------
 man/ico.man |    3 ++
 2 files changed, 38 insertions(+), 32 deletions(-)

New commits:
commit 9db7347730f3c8c9d77e5be4c9746f6d614ce470
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jun 1 23:58:50 2014 -0700

    Add -version option to print program version
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 30cb700ab15c963a5cbf16cfe6281d5841f59532
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jun 1 23:55:00 2014 -0700

    Print which option was in error along with usage message
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 3db5ac8466abe367a0a37efe4289aa6c7886e621
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jun 1 23:52:26 2014 -0700

    Combine usage message array into single string
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>