From: Daniel Ribeiro <redacted>
Date: Mon, 10 Jan 2011 17:58:05 +0000 (-0200)
Subject: Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
X-Git-Tag: libsigrok-0.1.0~453
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=2566bd4884bf33518488504575ba62e99ef43a7b

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

2566bd4884bf33518488504575ba62e99ef43a7b
diff --cc sigrok.h
index ebbfcb89,4373fcb4..59d6b1a3
--- a/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;