]> git.parisson.com Git - deefuzzer.git/commitdiff
projects / deefuzzer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cda78b 8bda1de)
Merge remote-tracking branch 'remotes/upstream/dev' into dev
authorachbed <github@achbed.org>
Thu, 29 Jan 2015 22:53:37 +0000 (16:53 -0600)
committerachbed <github@achbed.org>
Thu, 29 Jan 2015 22:53:37 +0000 (16:53 -0600)
1  2 
README.rst patch | diff1 | diff2 | blob | history

diff --cc README.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.