]> gitweb.ps.run Git - ps-cgit/commitdiff
projects / ps-cgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 961893b e032761)
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Sun, 18 Mar 2012 10:19:59 +0000 (10:19 +0000)
committerLars Hjemli <hjemli@gmail.com>
Sun, 18 Mar 2012 10:19:59 +0000 (10:19 +0000)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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