Richard Wilbur 쓴 글: > When all changes are committed, merge in the changes from the trunk to > bring your branch up to date with 'bzr merge'. Review changes at any > time with 'bzr diff'. When you are happy with the state of the code as > merged, commit the merged changes with 'bzr commit -m "Merge from > trunk."' or some such. Then create a patch with 'bzr send -o > name_of_patch_file.patch' and send it to the mailing list for review. > Thanks for detailed instruction. :-) Now I made a commit and attached a file generated from 'bzr send'. Please have a look again.
-- Regards, Namhyung Kim
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: namhy...@gmail.com-20090501005958-c00udpalnqa6e6rc # target_branch: http://bzr.savannah.gnu.org/r/gnash/trunk/ # testament_sha1: be8a014fbd367ec044abeb0424676ed7ec74be37 # timestamp: 2009-05-01 10:01:12 +0900 # base_revision_id: s...@keybit.net-20090430164406-aebvdcjj6la73v0s # # Begin patch === modified file 'macros/gtk2.m4' --- macros/gtk2.m4 2009-02-25 22:33:03 +0000 +++ macros/gtk2.m4 2009-05-01 00:59:58 +0000 @@ -76,7 +76,7 @@ if test x"${with_gtk2_lib}" != x ; then if test -f ${with_gtk2_lib}/libgtk-x11-2.0.${shlibext}; then if test -f ${with_gtk2_lib}/libgdk-x11-2.0; then - ac_cv_path_gtk2_lib="-I`(cd ${with_gtk2_lib}; pwd)`" + ac_cv_path_gtk2_lib="-L`(cd ${with_gtk2_lib}; pwd)`" else AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain libgdk-x11-2.0]) fi # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ38fysAAW1fgAQwVeP//1IN AAD////6UAN5vbVruupPZ7zwSUU9U/Umam9U8mpsU0eUYnqbQmJiaGh6IJKJqZiZE0Jk9NJoDRoA A0ABJCTKZNNNUz9VNp6p6mnqeoeiGjJ5Rp6nqPSBGpEyaMm1A9RkYnqNNGQBhNGmASSTRT2ppkTe pkGjRNNGjI0AABDY6dZTh3FazmmGWdnxsiQGWU41EYKPjv4U78TTrYZrPFcZUGrpZ3bxpdwz88Hd tXF9zLgwc9+PKeWsl+I1YM7sSbmuoEYaWQZNmqLc9dtho0qsTjL0qsWHrczbIxZdyXOqVdiMnHHq lkCUUGrUL4mHjCNZeFaLEppYk4UnQUSzJgxM15AiRS4gkQbf4rCwVuheGDqWaM8Q8VKbhAp7bZEL 2a33eJDcZi1NJONhFwwYbihy6a7E6FW/Ia/O6JWsSh3ChdbIsqqVLCs7bmGQmYzi3185LGcirVCi NxqqKicZOY660eJkG+b3OfaKUTRKS8PQOVGdTFRULAfKdAWlyawZTqYiOHsbeKPATyvrKi8tlRUP MNEbBxiEPyFgqaxtZFdI6FEnOjMQOH9KzhrLGC2MJcWO6MhmY0oNDFs8j57om5NnjUl2rRhYmG4v 7u3NsqU6NCcMj5RpnjQ38nF8YZSYwmlLSspzzHGqzFOpTyByWx4pj9YlM/VKJ/IncN0G2mMqH+nK GYvmrugXKSChhNgMFYrTaexAqCF8ecraMEaut270slmt9tEIc5mwTUzAiU3GpaS4p1lYtWjHzNQU G3cNPfJBYN0DiV29LUvDfcRTGfmjRa7KmRNVTHIDsxBYlOA9bE+NZz2FhgYeUFHGnJuc1bdFySQa l3itS67ZNPBmcjv1Y2jWhCegCVPkyJmGJDiko7kmLm4n8Qi1Y2ukAspApWQlwPl+1OiOQQDFAEET oDASHVQ+sTnIxDc2vIB2B0xgZgtiI2zRAeBZK7YcOI+ZsbJXH1QVJqqJw5MKZ0QK4isB7IZW9VZY lwY5ZgN8kqNIVQUJE+qeXLe3CaOfOtVJANM957xkKsNouagv0KQcusUraRT2TsYqIRqzqF0PHoDr mTYZd7ciCgze8sLcGLjIBpqikG1lOFNbfbI6+Ze12vpKYF1rY+wmXi8i8NCZMrGVHH1Xxb/OAF6J ympXYrkoFGevpJ1KSZjGNVZc6/UCe6PvHSH+LuSKcKEhO/j+Vg==
_______________________________________________ Gnash-dev mailing list Gnash-dev@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-dev
