OSDN Git Service

(root) / tryos / TryOS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b0afd0 8eaca2d)
Merge branch 'develop' master
authorhideaki.sago <hideaki.sagoq>
Sun, 18 Mar 2012 16:57:11 +0000 (01:57 +0900)
committerhideaki.sago <hideaki.sagoq>
Sun, 18 Mar 2012 16:57:11 +0000 (01:57 +0900)
Conflicts:
Builder/Debug/Makefile


Trivial merge
About OSDN
Find Software
Develop Software
Help