diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 16:56:40 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 16:56:40 +0000 |
| commit | 42f0b0850c692549fa9049c735a67ad3dea2e097 (patch) | |
| tree | 197137d97844aff2bf396792974c7822dcc6dae0 /Makefile | |
| parent | fd0103d3786249bf12a9dc1533c499c10f607cdd (diff) | |
| parent | ddc7bd2879e4344f56d8b759ead4c7c20a699dca (diff) | |
Merge remote-tracking branch 'origin/master' into next
Conflicts:
spec/Connection_Interface_IRC_Command1.xml
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions