Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok

diff --cc sigrok.h
index ebbfcb89e32fd9b9c63d826992cefa6b69e0e8b2,4373fcb497266c6663e64e059923fef8373daae7..59d6b1a3082978d361b7692ba67a892c7cf56f1b
--- 1/sigrok.h
--- 2/sigrok.h
+++ b/sigrok.h
@@@ -112,13 -113,11 +115,12 @@@ struct datafeed_header 
        struct timeval starttime;
        uint64_t samplerate;
        int protocol_id;
 -      int num_probes;
 +      int num_analog_probes;
 +      int num_logic_probes;
  };
  
- /*
-  * Input
-  */
+ 
+ 
  struct input {
        struct input_format *format;
        void *param;