Merge branch 'master' into radar
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 15:47:25 +0000 (17:47 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 7 Jul 2012 15:47:25 +0000 (17:47 +0200)
commit6ad7dd18fb9a1c674708e32fce3f4e89c8f1d83d
treef2bf9a216cca19f21161a6035aa6007fb83314da
parent8dc065b3012754fb34dcb04b7ce295cca4be0627
parent6335dfc137e25f7fb1d7e5a6585a18502c37f800
Merge branch 'master' into radar

Conflicts:
carlfw/include/carl9170.h
include/shared/fwdesc.h
include/shared/version.h
tools/src/fwinfo.c
carlfw/include/carl9170.h
carlfw/src/fw.c
include/shared/fwdesc.h
tools/src/fwinfo.c