diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
commit | 571d570e1be6f783a2e8ef0dafa838e9d82f923e (patch) | |
tree | 9b18682751acba56d650129922ecc4c5f12a3469 /Java/com/phidgets/EncoderPhidget.java | |
parent | 62172377c57ff85bce35a43e0ca3e76f67a473ad (diff) | |
parent | 4e6290d8e2dc4dcd784102bdab18d7e1854e11c0 (diff) | |
download | libphidget21-571d570e1be6f783a2e8ef0dafa838e9d82f923e.tar.gz |
Merge branch 'master' into squeeze-backportssqueeze-backports
Conflicts:
debian/changelog
Diffstat (limited to 'Java/com/phidgets/EncoderPhidget.java')
-rw-r--r-- | Java/com/phidgets/EncoderPhidget.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Java/com/phidgets/EncoderPhidget.java b/Java/com/phidgets/EncoderPhidget.java index 7430aec..1543bd3 100644 --- a/Java/com/phidgets/EncoderPhidget.java +++ b/Java/com/phidgets/EncoderPhidget.java @@ -1,6 +1,6 @@ /* - * Copyright 2012 Phidgets Inc. All rights reserved. + * Copyright 2006 Phidgets Inc. All rights reserved. */ package com.phidgets; @@ -12,10 +12,7 @@ import com.phidgets.event.*; * to read encoder data from an encoder are implemented in this class. <p> Phidget Encoder boards generally support 1 or more encoders with 0 or more digital inputs. - Both high speed optical and low speed mechanical encoders are supported with this API. - * See your device's User Guide for more specific API details, - * technical information, and revision details. The User Guide, along with other resources, can be found on - * the product page for your device. + Both high speed optical and low speed mechanical encoders are supported with this API. * * @author Phidgets Inc. */ |