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 | |
| parent | 878ccf082ab98e9654179493307138c88b2fe1ad (diff) | |
| parent | f2fd700249231803a896d99b0031292929b761b1 (diff) | |
Merge branch 'master' into arc
Conflicts:
tikzit/README
Diffstat (limited to 'tikzit')
| -rw-r--r-- | tikzit/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tikzit/README b/tikzit/README index 4d3eab1..9b83327 100644 --- a/tikzit/README +++ b/tikzit/README @@ -4,4 +4,4 @@ For more info, see http://tikzit.sf.net On OS/X, the Cocoa framework is used. -On other platforms, GTK+ and GNUstep are used. +On other platforms, GTK+ and GNUstep are used.
\ No newline at end of file |