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_Manager.h | |
| 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_Manager.h')
0 files changed, 0 insertions, 0 deletions