Merge branch 'feature/beta_api' into develop

PyramidTechnologies · Apr 28, 2017 · faff9b9 · faff9b9
2 parents 4bf55a2 + 90158ed
commit faff9b9
Show file tree

Hide file tree

Showing 103 changed files with 7,456 additions and 82,915 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,14 @@ RelianceTalk/obj/
 RelianceTalk.Test/obj/
 RelianceTalk.Test/bin/
 RelianceTalk/bin/
+ThermalConsole/bin/
+ThermalConsole/obj/
+ThermalTalk.Imaging.Test/obj/
+ThermalTalk.Imaging/bin/
+ThermalTalk.Imaging/obj/
+ThermalTalk.Test/obj/
+ThermalTalk/obj/
+ThermalTalk.Test/bin/
+ThermalTalk/bin/
+ThermalTalk.Imaging.Test/bin/
+packages/
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-# RelianceTalk
-Reliance Thermal Printer API
+# ThermalTalk
+Pyramid Technologis Thermal Printer API
 
 Alpha API for the Reliance Thermal Printer
 
 ## Supports
-Real Time Status Request
+Real Time Status Request, Basic Font Controls
diff --git a/RelianceTalk.sln b/RelianceTalk.sln