| commit | b7541dfb4a942401901e9cdf1efc4847da51c692 | |
| author | Joakim Verona <joakim@verona.se> | |
| Tue, 3 Feb 2015 00:07:36 +0000 (3 01:07 +0100) | ||
| committer | Joakim Verona <joakim@verona.se> | |
| Tue, 3 Feb 2015 00:07:36 +0000 (3 01:07 +0100) | ||
| tree | 9a905395b57b0f22189eea60c80bcae8660fb0ca | treesnapshot (tar.gz zip) |
| parent | 796514a9ab74da9f3931755bd8183ad732567ebc | commitdiff |
| parent | c10828bd8520db83cc06a2ad5de6f8a1ad74b83c | commitdiff |
Merge branch 'master' into xwidget
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog