Kaydet (Commit) 23d3a5e2 authored tarafından Caolán McNamara's avatar Caolán McNamara

lost the patch directives on merge conflict fix

Change-Id: I69321f8a5b4c0377ac6ceb7b6795d25bd9a3e6ba
üst 6843ce88
--- misc/mythes-1.2.3/makefile.mk 2010-05-14 23:36:09.000000000 +0200
+++ misc/build/mythes-1.2.3/makefile.mk 2010-05-14 23:35:14.000000000 +0200
@@ -1 +1,84 @@
-dummy
+#*************************************************************************
+#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment