| commit | d8ad369f8edf2468c31e3391c43648af7fe3d518 | |
| author | Dimitar Zhekov <dimitar.zhekov@gmail.com> | |
| Sat, 18 Apr 2015 09:31:41 +0000 (18 12:31 +0300) | ||
| committer | Dimitar Zhekov <dimitar.zhekov@gmail.com> | |
| Sat, 18 Apr 2015 09:31:41 +0000 (18 12:31 +0300) | ||
| tree | 6934bfd4e843b566f73427294971687fb9ffae48 | treesnapshot (tar.gz zip) |
| parent | 902681d260435fde5181652839a9e49170150c41 | commitdiff |
| parent | b8684a00f0b9bccbe739f797ffea92bb6b33613a | commitdiff |
Merge branch 'master' of https://github.com/geany/geany into spawn
Conflicts:
src/build.c
src/tools.c
Conflicts:
src/build.c
src/tools.c