From 4cd8a68a0ed6a5714fb05c51dde8c9da814a5731 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 18 6月 2013 22:44:55 +0800
Subject: [PATCH] Update to master

---
 libscpi/inc/scpi/types.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 295009c..dff7991 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -1,5 +1,7 @@
 /*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * Copyright (c) 2013 Jan Breuer
+ *                    Richard.hmm
+ * Copyright (c) 2012 Jan Breuer
  *
  * All Rights Reserved
  * 
@@ -135,7 +137,8 @@
         SCPI_UNIT_OHM,
         SCPI_UNIT_HERTZ,
         SCPI_UNIT_CELSIUS,
-        SCPI_UNIT_SECONDS
+        SCPI_UNIT_SECONDS,
+        SCPI_UNIT_DISTANCE
     };
     typedef enum _scpi_unit_t scpi_unit_t;
 

--
Gitblit v1.9.1