Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -4/+5 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge branch 'master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -3/+0 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 4 | -7/+90 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 26 | -0/+3573 |