| commit | 95edd7b22b2c0dfa7cc5ec661c219afe94a6785c | |
| author | Mikael Hallendal <micke@imendio.com> | |
| Thu, 15 Feb 2007 14:45:03 +0000 (15 15:45 +0100) | ||
| committer | Mikael Hallendal <micke@imendio.com> | |
| Thu, 15 Feb 2007 14:45:03 +0000 (15 15:45 +0100) | ||
| tree | 35e4a123d0115b214febea3462d096fa8944efa3 | treesnapshot (tar.gz zip) |
| parent | 1522eaad6af25b2db455e2bdea1bb978f2fe8c9e | commitdiff |
| parent | 2926a7f171001402f71473aeb325ebea733a6a46 | commitdiff |
Merge branch 'master' of git://kenny.imendio.com/sven/giggle
Conflicts:
data/main-window.glade
Conflicts:
data/main-window.glade
| src/giggle-window.c | diff1 | diff2 | blobhistory |