aboutsummaryrefslogtreecommitdiff
path: root/doc/twin-calculator.odt
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2012-05-31 13:48:42 +0200
committerThomas White <taw@physics.org>2012-05-31 13:48:42 +0200
commit13770d8553f9696c1c4c0c56703717524c028d86 (patch)
tree23c9f11f0407207ad24a8f7a4f6c72d52d0e7822 /doc/twin-calculator.odt
parent6ff1bbbd0deeac54175fc862a6e1b53374ae6306 (diff)
parentb6e0b7972e3dbdace0034d439b992faf3ac8c454 (diff)
Merge branch 'master' into tom/speed
Conflicts: .gitignore
Diffstat (limited to 'doc/twin-calculator.odt')
-rw-r--r--doc/twin-calculator.odtbin22080 -> 21250 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/twin-calculator.odt b/doc/twin-calculator.odt
index 16e43495..108aac55 100644
--- a/doc/twin-calculator.odt
+++ b/doc/twin-calculator.odt
Binary files differ