projects / platform / upstream / ejdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e9cdf 77e60bb)
Merge branch 'master' into ticket3
authoradam <anton@adamansky.com>
Fri, 9 Nov 2012 03:20:32 +0000 (10:20 +0700)
committeradam <anton@adamansky.com>
Fri, 9 Nov 2012 03:20:32 +0000 (10:20 +0700)
1  2 
binding.gyp patch | diff1 | diff2 | blob | history
tcejdb/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc binding.gyp
Simple merge
diff --cc tcejdb/Makefile.in
Simple merge
Domain: System / System Framework; Licenses: LGPL-2.1;