Commit graph

6 commits

Author SHA1 Message Date
flyskyko
d311ccc377 fix merge error
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9276 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-09-22 10:19:58 +00:00
flyskyko
105e3f4843 merge 1.4.5.10
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-09-22 08:23:36 +00:00
flyskyko
a0d57a320f merge with 1.4.5 branch(1.4.5.10)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-09-22 05:29:04 +00:00
taggon
620b03d184 set svn property - svn:eol-style LF
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8253 201d5d3c-b55e-5fd7-737f-ddc643e51545
2011-04-01 06:51:30 +00:00
ngleader
b8299c8a65 merge sandbox to trunk for 1.4.4
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-09-28 07:24:47 +00:00
zero
200d63636c merge sandbox to trunk for 1.4.3.1
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
2010-08-25 06:19:21 +00:00