]> www.infradead.org Git - users/dedekind/aiaiai.git/commitdiff
projects / users / dedekind / aiaiai.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aee7e5d c39ed20)
aiaiai: merge development work
authorJacob Keller <jacob.e.keller@intel.com>
Thu, 13 Nov 2014 18:27:23 +0000 (10:27 -0800)
committerJacob Keller <jacob.e.keller@intel.com>
Thu, 13 Nov 2014 18:27:23 +0000 (10:27 -0800)
The development branch has been stable in my test environment for a
while now. I think now is a good time to get these changes back into
master.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
1  2 
doc/README patch | diff1 | diff2 | blob | history

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