aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorBert Münnich <be.muennich@gmail.com>2013-02-09 01:21:57 +0100
committerBert Münnich <be.muennich@gmail.com>2013-02-09 01:21:57 +0100
commitbf4101249306669ebd5134fd0594376f00cb4538 (patch)
tree01e03a5583ed97b9b0ec8ed4fb171285ebdc8baf /LICENSE
parentf7301cf4f9f93a00faecbf8701e690ba99ddac35 (diff)
parent3f25b907bd1fbea563ddf335fb3d308094fa81c6 (diff)
Merge remote-tracking branch '4z3/set-user-specified-sizehints' into sizehints
Conflicts: window.c
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions