[cairo-commit] rcairo ChangeLog,1.170,1.171

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv7585

Modified Files:
	ChangeLog 
Log Message:
* src/rb_cairo_font_options.c (Cairo::FontOptions#merge): renamed
  to merge! because the method is destructive.

* src/lib/cairo.rb (Cairo::FontOptions#merge): added
  non-destructive version.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- ChangeLog	23 May 2007 13:02:41 -0000	1.170
+++ ChangeLog	26 May 2007 15:13:24 -0000	1.171
@@ -1,3 +1,11 @@
+2007-05-27  Kouhei Sutou  <kou at cozmixng.org>
+
+	* src/rb_cairo_font_options.c (Cairo::FontOptions#merge): renamed
+	to merge! because the method is destructive.
+
+	* src/lib/cairo.rb (Cairo::FontOptions#merge): added
+	non-destructive version.
+
 2007-05-23  Kouhei Sutou  <kou at cozmixng.org>
 
 	* src/lib/cairo.rb (Cairo.normalize_const_name): treated "." as