diff options
| author | Renanse <[email protected]> | 2013-03-14 21:52:41 -0500 |
|---|---|---|
| committer | Renanse <[email protected]> | 2013-03-14 21:52:41 -0500 |
| commit | 19bd8d8e1e5de5d31fab60bf2a3dedc9778782d0 (patch) | |
| tree | f14c233f6181afaf91d00f83d5e078af27c3cafd /ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs | |
| parent | aedbc04cc0c605496fc5aa12ba074643ef16d6d9 (diff) | |
| parent | c81013c8f8bec5588be7e762a254c509286cbb46 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
ardor3d-collada/src/main/java/com/ardor3d/extension/model/collada/jdom/data/DataCache.java
Diffstat (limited to 'ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs')
| -rw-r--r-- | ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs b/ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs index f479490..7588391 100644 --- a/ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs +++ b/ardor3d-awt/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,3 @@ -#Sun Jan 04 11:43:23 CST 2009
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=true
|