volvet 8a7a15ff30 fix merge conflict

2014-01-04 08:20:56 +08:00

..

astyle.cfg

Pretty printed the C++ code with astyle

2013-12-12 14:21:12 -08:00

gtest-targets.mk

Use $(AR) instead of explicitly calling 'ar'

2013-12-17 12:29:21 +02:00

mktargets.py

Use $(AR) instead of explicitly calling 'ar'

2013-12-17 12:29:21 +02:00

mktargets.sh

resolve conflict

2014-01-03 14:49:45 +08:00

platform-darwin.mk

fix merge conflict

2014-01-04 08:20:56 +08:00

platform-freebsd.mk

Add MinGW platform makefile and related source changes

2013-12-23 21:42:31 +01:00

platform-linux.mk

fix merge conflict

2014-01-04 08:20:56 +08:00

platform-mingw_nt.mk

1. fix gcc 3.4 link error.

2014-01-02 17:19:25 +08:00