Dummy merge branch 'feature/savingsketches' to preserve history.

Browse Source

Commit [0b5cf1a] contains (most) of the changes in that branch, but in working form.
The merge was created as described here: <http://www.claassen.net/geek/blog/2011/02/git-merge-strategytheirs.html>.

...

This commit is contained in:

Wouter R 2013-11-08 20:53:26 +01:00

parent d715d19412 3b192078b4

commit fe9c2cc5ea

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available