projects / profile / ivi / murphy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7b3e9a ab176ec)
Merge branch 'master' of https://github.com/otcshare/policy-internal
authorJanos Kovacs <jankovac503@gmail.com>
Thu, 14 Feb 2013 02:04:01 +0000 (04:04 +0200)
committerJanos Kovacs <jankovac503@gmail.com>
Thu, 14 Feb 2013 02:04:01 +0000 (04:04 +0200)
1  2 
src/Makefile.am patch | diff1 | diff2 | blob | history
src/daemon/murphy.lua patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.am
Simple merge
diff --cc src/daemon/murphy.lua
Simple merge
Domain: Multimedia / Uncategorized;