commit de9537cc186b6fd14f8b859ee4db28074697a3c9
Merge: 5924557 8588b53
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 13 16:07:55 2011 +0200
Merge branch 'master' into f15
Conflicts:
google-gson.spec
google-gson-test-fails-workaround-2.patch | 21 +++++++++++++++++++++
google-gson.spec | 13 +++++++++----
2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --cc google-gson.spec
index 2cdbaa7,d6e6ac5..6d400c1
--- a/google-gson.spec
+++ b/google-gson.spec
@@@ -29,9 -30,9 +30,9 @@@ Requires(post): jpackage-util
Requires(postun): jpackage-utils
%description
--Gson is a Java library that can be used to convert a Java object into its
--JSON representation. It can also be used to convert a JSON string into an
--equivalent Java object. Gson can work with arbitrary Java objects including
++Gson is a Java library that can be used to convert a Java object into its
++JSON representation. It can also be used to convert a JSON string into an
++equivalent Java object. Gson can work with arbitrary Java objects including
pre-existing objects that you do not have source-code of.
%package javadoc
Show replies by date