Hi Christopher, thanks for the update! On Fri, Aug 28, 2009 at 09:27:42PM +0200, Christopher Roy Bratusek wrote: > Additions: > GError support [Jürgen Hötzel] > Basic GtkBuilder support [Jürgen Hötzel] >
sadly you rewrote git history by manually combining multiple commits and a ChangLog entry into a single commit: .. commit 04675d7afa57183901f98cc661b482936804ef9e Author: chrisb <[email protected]> Date: Wed Aug 26 20:17:43 2009 +0200 sync with Jürgen Hötzels branch So i was forced to merge instead of simply pulling from your tree. If i rebase (i will loose my micro-commits): * commit a3a7f1d0d6ddd97e1b42262132560aa9318e4e73 |\ \ Merge: a0714c0 04675d7 | |/ Author: Juergen Hoetzel <[email protected]> | | Date: Thu Aug 27 08:07:53 2009 +0200 | | | | merged upstream | | | * commit 04675d7afa57183901f98cc661b482936804ef9e | | Author: chrisb <[email protected]> | | Date: Wed Aug 26 20:17:43 2009 +0200 | | | | sync with Jürgen Hötzels branch | | * | commit a0714c0575af6150b4e32b160c8d957ee55f0da5 | | Author: Juergen Hoetzel <[email protected]> | | Date: Tue Aug 25 20:51:14 2009 +0200 | | | | Wrap GtkBuilder functions/objects | | | | Implemented: gtk_builder_new, gtk_builder_add_from_file, | | gtk_builder_get_object, gtk_builder_connect_signals. | | | | GError** output arguments not handled: NULL Pointer default argument | | passed. | | | | Added simple GtkBuilder example code: examples/gtk-builder.jl | | * | commit dc7fd5d4ec32895abce751559881395dc8835770 | | Author: Juergen Hoetzel <[email protected]> | | Date: Tue Aug 25 16:21:54 2009 +0200 | | | | Fix definition of GdkPixbuf | | | | GdkPixbuf is derived from GObject not a boxed type. | | * | |/ | These changes are all independent from each other. The commit-messages describe the single change they introduce and thus they should be individual commits: Users can better track changes. Git bisect works. And I can simple pull from your tree! Please do a simple pull next time! Thanks! Jürgen
