| commit | 5fedb1eab1ea41fc87c0416eb91344c4cf6af7f7 | |
| author | Shaun McCance <shaunm@gnome.org> | |
| Mon, 16 Jun 2014 21:15:38 +0000 (16 17:15 -0400) | ||
| committer | Shaun McCance <shaunm@gnome.org> | |
| Mon, 16 Jun 2014 21:15:38 +0000 (16 17:15 -0400) | ||
| tree | 962cd1b2d807a7d8e3967a97c0ab7c541c2ed330 | treesnapshot (tar.gz zip) |
| parent | 780c67e4e48470457223fe03ae43a6017254fa1d | commitdiff |
| parent | 4d9d8742358c66e1d4f0efa9f2a83d8cef763caf | commitdiff |
Merge branch 'master' into new-aday-design
Conflicts:
src/yelp-window.c
Conflicts:
src/yelp-window.c
| configure.ac | diff1 | diff2 | blobhistory |
| libyelp/yelp-view.c | diff1 | diff2 | blobhistory |
| src/yelp-application.c | diff1 | diff2 | blobhistory |
| src/yelp-window.c | diff1 | diff2 | blobhistory |