You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+2-7Lines changed: 2 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -5,7 +5,7 @@
5
5
6
6
## Release Branch
7
7
8
-
The Release branch contains the latest tagged version of Marlin (currently 1.0.2-1 – January 2015). It also includes a version 1.0.1 (December 2014). Any version of Marlin before 1.0.1 (when we started tagging versions) can be collectively referred to as Marlin 1.0.0.
8
+
The Release branch contains the latest tagged version of Marlin (currently 1.0.2-2 – October 2016). It also includes a version 1.0.1 (December 2014). Any version of Marlin before 1.0.1 (when we started tagging versions) can be collectively referred to as Marlin 1.0.0.
9
9
10
10
## Patches - 1.0.x Branch
11
11
@@ -24,15 +24,12 @@ Marlin development is being accelerated to catch up with a long list of issues.
24
24
25
25
##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
26
26
27
-
## Contact
28
-
29
-
__Google Hangout:__ <ahref="https://plus.google.com/hangouts/_/gxn3wrea5gdhoo223yimsiforia"target="_blank">. Hangout</a> We have a hangout every 2 weeks. Search the issue list for "Hangout" to determine the time and date of the next event.
30
-
31
27
## Credits
32
28
33
29
The current Marlin dev team consists of:
34
30
35
31
- Scott Lahteine [@thinkyhead] - English
32
+
- Roxanne Neufeld [@Roxy-3DPrintBoard] - English
36
33
- Andreas Hardtung [@AnHardt] - Deutsch, English
37
34
-[@Wurstnase] - Deutsch, English
38
35
-[@fmalpartida] - English, Spanish
@@ -44,8 +41,6 @@ The current Marlin dev team consists of:
0 commit comments