Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' | Renanse | 2013-03-14 | 31 | -4582/+4547 |
|\ | | | | | | | | | Conflicts: ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java | ||||
| * | normalized line endings | neothemachine | 2013-02-21 | 27 | -4429/+4429 |
| | | | | | | | | | | | | see http://www.hanselman.com/blog/YoureJustAnotherCarriageReturnLineFeedInTheWall.aspx and https://help.github.com/articles/dealing-with-line-endings | ||||
| * | Merge branch 'master' into dependencies | neothemachine | 2013-02-11 | 4 | -37/+26 |
| |\ | |||||
| | * | Dropped uses of getIndexBuffer | renanse | 2013-01-20 | 1 | -1/+1 |
| | | | |||||
| | * | Switched more code to using more efficient index buffers. | renanse | 2013-01-20 | 1 | -32/+25 |
| |/ |/| | |||||
| * | let eclipse remove timestamps out of .prefs files | neothemachine | 2012-12-05 | 2 | -2/+1 |
| | | | | | | | | | | | | (these aren't written since eclipse 3.7.2, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=342709 and https://bugs.eclipse.org/bugs/show_bug.cgi?id=363836) | ||||
| * | Merge branch 'kill_trunk' into dependencies | neothemachine | 2012-12-05 | 2 | -27/+0 |
| | | |||||
* | | Various audit cleanup suggestions. | renanse | 2012-12-19 | 2 | -4/+0 |
|/ | |||||
* | move all files from trunk to root folder | neothemachine | 2012-12-05 | 76 | -0/+10309 |