1. 30 Jan, 2012 1 commit
    • Claudio Valerio's avatar
      Merge remote-tracking branch 'origin/Bett-2012' · fd3e8ddb
      Claudio Valerio authored
      Conflicts:
      	Sankore_3.1.pro
      	src/board/UBBoardPaletteManager.cpp
      	src/board/UBBoardView.cpp
      	src/document/UBDocumentProxy.cpp
      	src/gui/UBDockPaletteWidget.cpp
      	src/gui/UBTeacherBarWidget.h
      	src/web/UBWebController.h
      fd3e8ddb
  2. 27 Jan, 2012 5 commits
  3. 26 Jan, 2012 2 commits
  4. 25 Jan, 2012 7 commits
  5. 24 Jan, 2012 2 commits
  6. 23 Jan, 2012 10 commits
  7. 20 Jan, 2012 2 commits
  8. 19 Jan, 2012 6 commits
  9. 18 Jan, 2012 5 commits