Skip to content
Browse files

Merge branch 'master' of git@github.com:monde/mms2r

Conflicts:

	README.txt


git-svn-id: svn+ssh://rubyforge.org/var/svn/mms2r/trunk@277 e135c355-f531-400e-8cb8-2d0dfcbb2ce7
  • Loading branch information...
2 parents c436119 + dcf8945 commit 1d94fbd734ffe8749a514114dd566ef9af882474 mikemondragon committed
Showing with 5 additions and 1 deletion.
  1. +2 −1 History.txt
  2. +3 −0 README.txt
View
3 History.txt
@@ -1,4 +1,4 @@
-### 2.1.0 / 2008-07-XX (Dr. Gibbons – Birthday expert and Murderface expert)
+### 2.1.0 / 2008-07-30 (Dr. Gibbons – Birthday expert and Murderface expert)
* 1 major enhancement:
@@ -8,6 +8,7 @@
* UK O2 support mediamessaging.o2.co.uk - Jeremy Wilkins
* Write non text files with binary bit set on Windows - Nobody
+ * source hosted on github: git clone git://github.com/monde/mms2r.git
### 2.0.5 / 2008-07-17 (Dr. Ralphus Galkensmelter - Psychological death expert)
View
3 README.txt
@@ -127,11 +127,14 @@ http://peepcode.com/products/mms2r-pdf
* sudo gem install mms2r
+<<<<<<< HEAD:README.txt
== SOURCE
git clone git://github.com/monde/mms2r.git
svn co svn://rubyforge.org/var/svn/mms2r/trunk mms2r
+=======
+>>>>>>> dcf89451ea7ba0ff098d0d7ebd8ea16db1cc44ef:README.txt
== CONTRIBUTE
If you contribute a patch that is accepted then you'll get developer rights

0 comments on commit 1d94fbd

Please sign in to comment.
Something went wrong with that request. Please try again.