Commit e8aff5a3 authored by Claudio Valerio's avatar Claudio Valerio

Merge branch 'master' of github.com:Sankore/Sankore-3.1

parents d89ed793 d94f23c7
...@@ -1618,7 +1618,7 @@ ...@@ -1618,7 +1618,7 @@
<action name="actionCheckUpdate"> <action name="actionCheckUpdate">
<property name="icon"> <property name="icon">
<iconset resource="../sankore.qrc"> <iconset resource="../sankore.qrc">
<normaloff>:/images/toolbar/softwareUpdate.png</normaloff>:/images/toolbar/softwareUpdate.png</iconset> <normaloff>:/images/toolbar/updates.png</normaloff>:/images/toolbar/updates.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Check Update</string> <string>Check Update</string>
......
resources/images/toolbar/tutorial.png

3.03 KB | W: | H:

resources/images/toolbar/tutorial.png

2.94 KB | W: | H:

resources/images/toolbar/tutorial.png
resources/images/toolbar/tutorial.png
resources/images/toolbar/tutorial.png
resources/images/toolbar/tutorial.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</head> </head>
<body onunload="alert("!!")"> <body>
<script type="text/javascript"> <script type="text/javascript">
......
...@@ -202,7 +202,6 @@ ...@@ -202,7 +202,6 @@
<file>images/toolbar/tutorial.png</file> <file>images/toolbar/tutorial.png</file>
<file>images/edit-mode.svg</file> <file>images/edit-mode.svg</file>
<file>images/save.svg</file> <file>images/save.svg</file>
<file>images/toolbar/softwareUpdate.png</file>
<file>images/toolbar/stylusTab.png</file> <file>images/toolbar/stylusTab.png</file>
<file>images/libpalette/social.png</file> <file>images/libpalette/social.png</file>
<file>images/navig_arrow.png</file> <file>images/navig_arrow.png</file>
...@@ -284,5 +283,6 @@ ...@@ -284,5 +283,6 @@
<file>images/libpalette/miniNewFolder.png</file> <file>images/libpalette/miniNewFolder.png</file>
<file>images/libpalette/miniFavorite.png</file> <file>images/libpalette/miniFavorite.png</file>
<file>images/libpalette/home.png</file> <file>images/libpalette/home.png</file>
<file>images/toolbar/updates.png</file>
</qresource> </qresource>
</RCC> </RCC>
...@@ -6,5 +6,5 @@ instructions ...@@ -6,5 +6,5 @@ instructions
1. Download freetype (http://www.freetype.org/download.html#stable) 1. Download freetype (http://www.freetype.org/download.html#stable)
2. Decompress freetype.XXX.tar.gz 2. Decompress freetype.XXX.tar.gz
3. Update on freetype.pro file the freetype directory 3. Update on freetype.pro file the freetype directory
4. Run qmake freetype.pro 4. Run qmake freetype.pro (on mac add -spec macx-g++)
5. Run make 5. Run make
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment