projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08831de 30df3ec)
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorjakub <jakub.jaszczynski@comarch.com>
Thu, 30 Dec 2010 15:40:54 +0000 (16:40 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Thu, 30 Dec 2010 15:40:54 +0000 (16:40 +0100)
Conflicts:
src/mdictionary/mdictionary.pro

1  2 
src/mdictionary/mdictionary.pro patch | diff1 | diff2 | blob | history

diff --cc src/mdictionary/mdictionary.pro
index ce84a73,d2b6f46..b790af9
--- 1/src/mdictionary/mdictionary.pro
--- 2/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -95,7 -95,7 +95,8 @@@ OTHER_FILES += 
      qml/TranslationView.qml \
      qml/FlickableWebView.qml \
      qml/ScrollBar.qml \
 +    qml/SpinBox.qml
+     qml/Checkbox.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
Unnamed repository; edit this file to name it for gitweb.