git.asbjorn.biz / rapper.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 084b1d3)
Merge git+ssh://git.asbjorn.biz/rapper
authorSteffen Stengaard Villadsen <omegasteffy@gmail.com>
Thu, 4 Nov 2010 22:35:08 +0000 (23:35 +0100)
committerSteffen Stengaard Villadsen <omegasteffy@gmail.com>
Thu, 4 Nov 2010 22:35:08 +0000 (23:35 +0100)
Conflicts:
README

README patch | blob | history

diff --git a/README b/README
index f24e15d..713786a 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,2 @@
 Steff test
-
-Test2
\ No newline at end of file
+Svenne test
Reprap firmware for ARM