diff options
author | Johan Paulsson <gonz@badcode.net> | 2015-02-18 10:31:07 -0800 |
---|---|---|
committer | Johan Paulsson <gonz@badcode.net> | 2015-02-18 10:31:07 -0800 |
commit | 665f2f5d98eccf6dbeef4239383b917ef480068d (patch) | |
tree | 6d34ea7e5dc397caf86117c6b741c696a0c754f7 /tikzit/src/osx/PreviewController.m | |
parent | 878ccf082ab98e9654179493307138c88b2fe1ad (diff) | |
parent | f2fd700249231803a896d99b0031292929b761b1 (diff) |
Merge branch 'master' into arc
Conflicts:
tikzit/README
Diffstat (limited to 'tikzit/src/osx/PreviewController.m')
0 files changed, 0 insertions, 0 deletions