Merge branch 'develop' into shiba-dev

preferencesAboutTextFull
shibakaneki 12 years ago
commit 250951d517
  1. BIN
      JournalDesModifications.pdf
  2. BIN
      ReleaseNotes.pdf
  3. 2
      Sankore_3.1.pro
  4. 0
      resources/inDevelopmentWidgets/Balance.wgt/config.xml
  5. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
  6. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
  7. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
  8. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
  9. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/demo.html
  10. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/Lobster/stylesheet.css
  11. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
  12. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
  13. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
  14. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
  15. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
  16. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
  17. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
  18. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
  19. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
  20. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
  21. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
  22. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
  23. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
  24. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
  25. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
  26. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
  27. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
  28. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
  29. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
  30. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
  31. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.eot
  32. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.svg
  33. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.ttf
  34. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/SF_Toontime_Italic-webfont.woff
  35. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/demo.html
  36. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/fonts/SF-Toontime/stylesheet.css
  37. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/balance.png
  38. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/bg.png
  39. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png
  40. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png
  41. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/pad-bd.png
  42. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/parameters-bg.png
  43. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png
  44. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png
  45. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png
  46. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-bd.png
  47. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-edit.png
  48. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-help.png
  49. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/slate-toolbar-reload.png
  50. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-edit.png
  51. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-help.png
  52. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/toolbar-reload.png
  53. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png
  54. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png
  55. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/main.css
  56. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/ubw-help.css
  57. 0
      resources/inDevelopmentWidgets/Balance.wgt/css/ubw-main.css
  58. 0
      resources/inDevelopmentWidgets/Balance.wgt/help.html
  59. 0
      resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages.properties
  60. 0
      resources/inDevelopmentWidgets/Balance.wgt/i18n/Messages_fr.properties
  61. 0
      resources/inDevelopmentWidgets/Balance.wgt/icon.png
  62. 0
      resources/inDevelopmentWidgets/Balance.wgt/index.html
  63. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/help-template.js
  64. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/help_fr-template.js
  65. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-1.7.1.min.js
  66. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-css-transform.js
  67. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery-ui-1.8.17.custom.min.js
  68. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/jquery.i18n.properties-min-1.0.9.js
  69. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/modernizr.js
  70. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/mustache.js
  71. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/lib/ubw-main.js
  72. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/main.js
  73. 0
      resources/inDevelopmentWidgets/Balance.wgt/js/templates.js
  74. 0
      resources/inDevelopmentWidgets/Cadran.wgt/config.xml
  75. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.eot
  76. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.svg
  77. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.ttf
  78. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/Lobster_1.3-webfont.woff
  79. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/demo.html
  80. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/Lobster/stylesheet.css
  81. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.eot
  82. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.svg
  83. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.ttf
  84. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime-webfont.woff
  85. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.eot
  86. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.svg
  87. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.ttf
  88. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch-webfont.woff
  89. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.eot
  90. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.svg
  91. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.ttf
  92. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Blotch_Italic-webfont.woff
  93. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.eot
  94. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.svg
  95. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.ttf
  96. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold-webfont.woff
  97. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.eot
  98. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.svg
  99. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.ttf
  100. 0
      resources/inDevelopmentWidgets/Cadran.wgt/css/fonts/SF-Toontime/SF_Toontime_Bold_Italic-webfont.woff
  101. Some files were not shown because too many files have changed in this diff Show More

Binary file not shown.

Binary file not shown.

@ -11,7 +11,7 @@ CONFIG += debug_and_release \
VERSION_MAJ = 2 VERSION_MAJ = 2
VERSION_MIN = 00 VERSION_MIN = 00
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
VERSION_PATCH = 04 VERSION_PATCH = 05
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "") VERSION = $$replace(VERSION, "\\.r", "")

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save