Merge remote-tracking branch 'sirherrbatka/icons-svg'

Conflicts: .gitignore
OpenMW · Aug 26, 2013 · fb7273e · fb7273e
2 parents dcc55b6 + c57fb4f
commit fb7273e
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ CMakeLists.txt.user
 .cproject
 .project
 .settings/
+.directory
diff --git a/files/opencs/raster/Info.png b/files/opencs/raster/Info.png
diff --git a/files/opencs/raster/LandTexture.png b/files/opencs/raster/LandTexture.png
diff --git a/files/opencs/raster/PathGrid.png b/files/opencs/raster/PathGrid.png
diff --git a/files/opencs/raster/birthsign.png b/files/opencs/raster/birthsign.png
diff --git a/files/opencs/raster/body-part.png b/files/opencs/raster/body-part.png
diff --git a/files/opencs/raster/cell.png b/files/opencs/raster/cell.png
diff --git a/files/opencs/raster/class.png b/files/opencs/raster/class.png
diff --git a/files/opencs/raster/enchantment.png b/files/opencs/raster/enchantment.png
diff --git a/files/opencs/raster/faction.png b/files/opencs/raster/faction.png
diff --git a/files/opencs/raster/globvar.png b/files/opencs/raster/globvar.png
diff --git a/files/opencs/raster/land.png b/files/opencs/raster/land.png
diff --git a/files/opencs/raster/landpaint.png b/files/opencs/raster/landpaint.png
diff --git a/files/opencs/raster/magic-effect.png b/files/opencs/raster/magic-effect.png
diff --git a/files/opencs/raster/magicrabbit.png b/files/opencs/raster/magicrabbit.png
diff --git a/files/opencs/raster/map.png b/files/opencs/raster/map.png
diff --git a/files/opencs/raster/race.png b/files/opencs/raster/race.png
diff --git a/files/opencs/raster/script.png b/files/opencs/raster/script.png
diff --git a/files/opencs/raster/skill.png b/files/opencs/raster/skill.png
diff --git a/files/opencs/raster/spell.png b/files/opencs/raster/spell.png
diff --git a/files/opencs/scalable/referenceable-record/.directory b/files/opencs/scalable/referenceable-record/.directory
@@ -1,5 +1,7 @@
 [Dolphin]
-PreviewsShown=true
-Timestamp=2013,3,21,10,19,49
+GroupedSorting=true
+SortFoldersFirst=false
+Timestamp=2013,8,11,16,50,43
 Version=3
-ViewMode=1
+ViewMode=2
+VisibleRoles=Compact_text,Compact_size
diff --git a/files/opencs/scalable/referenceable-record/activator.svg b/files/opencs/scalable/referenceable-record/activator.svg