aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-terrain
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Renanse2013-03-1431-4582/+4547
|\ | | | | | | | | Conflicts: ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java
| * normalized line endingsneothemachine2013-02-2127-4429/+4429
| | | | | | | | | | | | see http://www.hanselman.com/blog/YoureJustAnotherCarriageReturnLineFeedInTheWall.aspx and https://help.github.com/articles/dealing-with-line-endings
| * Merge branch 'master' into dependenciesneothemachine2013-02-114-37/+26
| |\
| | * Dropped uses of getIndexBufferrenanse2013-01-201-1/+1
| | |
| | * Switched more code to using more efficient index buffers.renanse2013-01-201-32/+25
| |/ |/|
| * let eclipse remove timestamps out of .prefs filesneothemachine2012-12-052-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 dependenciesneothemachine2012-12-052-27/+0
| |
* | Various audit cleanup suggestions.renanse2012-12-192-4/+0
|/
* move all files from trunk to root folderneothemachine2012-12-0576-0/+10309