diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 10:24:35 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-30 10:24:46 +0000 |
| commit | 980156c4cb4a8c29335de83bbf1ac05a9a1f01a9 (patch) | |
| tree | b42a2b4309a5c815b902b80435d72ad4f1c6a297 | |
| parent | c8de2b11bbbf5705ee20bf68d0c11e455b441312 (diff) | |
| parent | bcb1ece652c211bc88771da775332a2c9a0ae572 (diff) | |
| download | glib-980156c4cb4a8c29335de83bbf1ac05a9a1f01a9.tar.gz | |
Merge tag '2.38.0' into baserock/morph with strategy 'theirs'baserock/morph
(Actually, it merged baserock/morph into '2.38.0' because we only
had the merge strategy 'ours')
0 files changed, 0 insertions, 0 deletions