Revision: 7056 Author: ek.kato Date: Tue May 10 01:19:26 2011 Log: * Merge r7054,r7055 from trunk.
http://code.google.com/p/uim/source/detail?r=7056 Modified: /branches/1.7/COPYING /branches/1.7/make-dist.sh ======================================= --- /branches/1.7/COPYING Thu Jan 6 18:09:56 2011 +++ /branches/1.7/COPYING Tue May 10 01:19:26 2011 @@ -58,14 +58,13 @@ modify, distribute and sell uim-toolbar-gtk-systray under the terms of LGPL *only*. - * qt/pref-kseparator.{cpp,h} and qt4/pref/kseparator.{cpp.h} are - come from kdeui, so you can use, modify, distribute and sell - uim-pref-qt{4} under the terms of LGPL *only*. - - * qt/chardict/chardict-kseparator.{cpp,h} and - qt4/chardict/kseparator.cpp are come from kdeui, so you - can use, modify, distribute and sell uim-chardict-qt{4} under the - terms of LGPL *only*. + * qt/pref-kseparator.{cpp,h} come from kdeui, so you can use, + modify, distribute and sell uim-pref-qt under the terms of LGPL + *only*. + + * qt/chardict/chardict-kseparator.{cpp,h} are come from kdeui, so + you can use, modify, distribute and sell uim-chardict-qt under + the terms of LGPL *only*. * pixmaps/*.{svg,png} are also licensed under the 3-clause BSD license, but has different copyright holders. See ======================================= --- /branches/1.7/make-dist.sh Mon May 9 23:54:48 2011 +++ /branches/1.7/make-dist.sh Tue May 10 01:19:26 2011 @@ -7,7 +7,7 @@ LIBGCROOTS_REPOSITORY="${UIM_REPOSITORY}/libgcroots-trunk" TAGS_REPOSITORY="${UIM_REPOSITORY}/tags" #SSCM_URL="${SSCM_REPOSITORY}" -SSCM_URL="${TAGS_REPOSITORY}/sigscheme-0.8.5" +SSCM_URL="${TAGS_REPOSITORY}/sigscheme-0.8.6" #LIBGCROOTS_URL="${LIBGCROOTS_REPOSITORY}" LIBGCROOTS_URL="${TAGS_REPOSITORY}/libgcroots-0.2.3" RELEASE_SUFFIX=""
