projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7cc317 4485a62)
Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Thu, 1 Aug 2013 05:09:55 +0000 (22:09 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Thu, 1 Aug 2013 05:09:55 +0000 (22:09 -0700)
Conflicts:
clearadm/log/clearagent.pl.log
clearadm/var/run/clearagent.pl.pid


Trivial merge
ClearSCM Source Repository. Note parts of this repo are under GPL. Other parts are copyright ClearSCM, Inc.