projects
/
web
/
altusmetrum
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9bf704f
02aadfc
)
TeleMini sn re-assigned from 92 to 96 to resolve conflict.
author
Bdale Garbee
<bdale@gag.com>
Wed, 28 Aug 2013 21:19:15 +0000
(15:19 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Wed, 28 Aug 2013 21:19:15 +0000
(15:19 -0600)
Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
Conflicts:
production.mdwn
1
2
production.mdwn
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
production.mdwn
index f5930a3607af357b7e2b152f85e239f5a4c76c93,1bdbe647a28c583eb0714b29903d83fbaa6ba508..aa12bccd4cd9b49f6a0ae43e8d80f5eed0002259
---
1
/
production.mdwn
---
2
/
production.mdwn
+++ b/
production.mdwn
@@@
-295,14
-295,6
+295,18
@@@
EasyMini v0.1 2013.05.19
TeleMini v1.1 2013.05.22.
+## sn 92-93 ##
+
+TeleMetrum v1.9 2013.08.27
+
+## sn 94-95 ##
+
+TeleMega v0.4 P 2013.08.28
+
++## sn 96 ##
++
++TeleMini v1.1 2013.08.25. From Phoenix panel.
++
## sn 100-207 ##
First production run of 108 pieces of TeleDongle v0.2 by