diff options
author | Tom Willemsen | 2010-10-21 19:31:54 +0200 |
---|---|---|
committer | Tom Willemsen | 2010-10-21 19:31:54 +0200 |
commit | 4b153e25e4b51a1cd4d7876bf6cd1dfb14744344 (patch) | |
tree | d75368042e589d89f6a12dd9234ab7f170bfed83 /src/c-new-item-dialog.c | |
parent | dcf562d835ecefb527b2138339e50e0720115069 (diff) | |
parent | e963880636c53d1ecd11b62f1be8a3e3c0dd9160 (diff) | |
download | eye-on-manga-4b153e25e4b51a1cd4d7876bf6cd1dfb14744344.tar.gz eye-on-manga-4b153e25e4b51a1cd4d7876bf6cd1dfb14744344.zip |
Merge branch 'data' into eye-on-manga
Conflicts:
src/c-edit-window.c
Diffstat (limited to 'src/c-new-item-dialog.c')
0 files changed, 0 insertions, 0 deletions