ardor3d.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Gets Renanse's changes	Julien Gouesse	2013-03-27	1	-113/+113
\|
*	Merge remote-tracking branch 'origin/master'	Renanse	2013-03-14	3	-5/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java
\| *	normalized line endings	neothemachine	2013-02-21	1	-113/+113
\| \| \| \| \| \| \| \| \| \| \| \|	see http://www.hanselman.com/blog/YoureJustAnotherCarriageReturnLineFeedInTheWall.aspx and https://help.github.com/articles/dealing-with-line-endings
\| *	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	1	-3/+0
\|/
*	move all files from trunk to root folder	neothemachine	2012-12-05	3	-0/+393