Viewing all changes in revision 28.
- Committer: Package Import Robot
- Date: 2012-06-21 21:53:10 UTC
- mfrom: (1.2.13) (3.1.22 sid)
- Revision ID: package-import@ubuntu.com-20120621215310-tzbos33dn30mgy9y
* [4bbcfdd9] Merge branch 'upstream' - 0.18.1
* [00c34d93] Refreshing patches.
* [00c34d93] Refreshing patches.
- files added:
- Styles/Styles.qrc
- semperMerk
- semperMerk/MouseMachine
- semperMerk/src
- semperMerk/src/images
- semperMerk/src/resources
- src/Backend
- src/common
- include/builtin-boost
- include/builtin-boost/boost
- include/builtin-boost/boost/algorithm
- include/builtin-boost/boost/algorithm/string
- include/builtin-boost/boost/algorithm/string/detail
- include/builtin-boost/boost/algorithm/string/std
- include/builtin-boost/boost/bind
- include/builtin-boost/boost/concept
- include/builtin-boost/boost/concept/detail
- include/builtin-boost/boost/concept_check
- include/builtin-boost/boost/config
- include/builtin-boost/boost/config/abi
- include/builtin-boost/boost/config/compiler
- include/builtin-boost/boost/config/no_tr1
- include/builtin-boost/boost/config/platform
- include/builtin-boost/boost/config/stdlib
- include/builtin-boost/boost/detail
- include/builtin-boost/boost/exception
- include/builtin-boost/boost/exception/detail
- include/builtin-boost/boost/format
- include/builtin-boost/boost/format/detail
- include/builtin-boost/boost/function
- include/builtin-boost/boost/function/detail
- include/builtin-boost/boost/function_types
- include/builtin-boost/boost/function_types/config
- include/builtin-boost/boost/function_types/detail
- include/builtin-boost/boost/function_types/detail/classifier_impl
- include/builtin-boost/boost/function_types/detail/components_impl
- include/builtin-boost/boost/function_types/detail/encoding
- include/builtin-boost/boost/function_types/detail/pp_cc_loop
- include/builtin-boost/boost/function_types/detail/pp_retag_default_cc
- include/builtin-boost/boost/function_types/detail/pp_tags
- include/builtin-boost/boost/function_types/detail/pp_variate_loop
- include/builtin-boost/boost/function_types/detail/synthesize_impl
- include/builtin-boost/boost/functional
- include/builtin-boost/boost/functional/detail
- include/builtin-boost/boost/functional/hash
- include/builtin-boost/boost/functional/hash/detail
- include/builtin-boost/boost/iterator
- include/builtin-boost/boost/iterator/detail
- include/builtin-boost/boost/math
- include/builtin-boost/boost/math/bindings
- include/builtin-boost/boost/math/complex
- include/builtin-boost/boost/math/concepts
- include/builtin-boost/boost/math/constants
- include/builtin-boost/boost/math/distributions
- include/builtin-boost/boost/math/distributions/detail
- include/builtin-boost/boost/math/policies
- include/builtin-boost/boost/math/special_functions
- include/builtin-boost/boost/math/special_functions/detail
- include/builtin-boost/boost/math/tools
- include/builtin-boost/boost/math/tools/detail
- include/builtin-boost/boost/mpl
- include/builtin-boost/boost/mpl/aux_
- include/builtin-boost/boost/mpl/aux_/config
- include/builtin-boost/boost/mpl/aux_/preprocessed
- include/builtin-boost/boost/mpl/aux_/preprocessed/bcc
- include/builtin-boost/boost/mpl/aux_/preprocessed/bcc551
- include/builtin-boost/boost/mpl/aux_/preprocessed/bcc_pre590
- include/builtin-boost/boost/mpl/aux_/preprocessed/dmc
- include/builtin-boost/boost/mpl/aux_/preprocessed/gcc
- include/builtin-boost/boost/mpl/aux_/preprocessed/msvc60
- include/builtin-boost/boost/mpl/aux_/preprocessed/msvc70
- include/builtin-boost/boost/mpl/aux_/preprocessed/mwcw
- include/builtin-boost/boost/mpl/aux_/preprocessed/no_ctps
- include/builtin-boost/boost/mpl/aux_/preprocessed/no_ttp
- include/builtin-boost/boost/mpl/aux_/preprocessed/plain
- include/builtin-boost/boost/mpl/aux_/preprocessor
- include/builtin-boost/boost/mpl/aux_/range_c
- include/builtin-boost/boost/mpl/aux_/test
- include/builtin-boost/boost/mpl/limits
- include/builtin-boost/boost/mpl/list
- include/builtin-boost/boost/mpl/list/aux_
- include/builtin-boost/boost/mpl/list/aux_/preprocessed
- include/builtin-boost/boost/mpl/list/aux_/preprocessed/plain
- include/builtin-boost/boost/mpl/map
- include/builtin-boost/boost/mpl/map/aux_
- include/builtin-boost/boost/mpl/map/aux_/preprocessed
- include/builtin-boost/boost/mpl/map/aux_/preprocessed/no_ctps
- include/builtin-boost/boost/mpl/map/aux_/preprocessed/plain
- include/builtin-boost/boost/mpl/map/aux_/preprocessed/typeof_based
- include/builtin-boost/boost/mpl/math
- include/builtin-boost/boost/mpl/multiset
- include/builtin-boost/boost/mpl/multiset/aux_
- include/builtin-boost/boost/mpl/set
- include/builtin-boost/boost/mpl/set/aux_
- include/builtin-boost/boost/mpl/set/aux_/preprocessed
- include/builtin-boost/boost/mpl/set/aux_/preprocessed/plain
- include/builtin-boost/boost/mpl/vector
- include/builtin-boost/boost/mpl/vector/aux_
- include/builtin-boost/boost/mpl/vector/aux_/preprocessed
- include/builtin-boost/boost/mpl/vector/aux_/preprocessed/no_ctps
- include/builtin-boost/boost/mpl/vector/aux_/preprocessed/plain
- include/builtin-boost/boost/mpl/vector/aux_/preprocessed/typeof_based
- include/builtin-boost/boost/numeric
- include/builtin-boost/boost/numeric/conversion
- include/builtin-boost/boost/numeric/conversion/detail
- include/builtin-boost/boost/numeric/interval
- include/builtin-boost/boost/numeric/interval/compare
- include/builtin-boost/boost/numeric/interval/detail
- include/builtin-boost/boost/numeric/interval/ext
- include/builtin-boost/boost/numeric/ublas
- include/builtin-boost/boost/numeric/ublas/detail
- include/builtin-boost/boost/optional
- include/builtin-boost/boost/parameter
- include/builtin-boost/boost/parameter/aux_
- include/builtin-boost/boost/parameter/aux_/preprocessor
- include/builtin-boost/boost/parameter/aux_/python
- include/builtin-boost/boost/preprocessor
- include/builtin-boost/boost/preprocessor/arithmetic
- include/builtin-boost/boost/preprocessor/arithmetic/detail
- include/builtin-boost/boost/preprocessor/array
- include/builtin-boost/boost/preprocessor/comparison
- include/builtin-boost/boost/preprocessor/config
- include/builtin-boost/boost/preprocessor/control
- include/builtin-boost/boost/preprocessor/control/detail
- include/builtin-boost/boost/preprocessor/control/detail/dmc
- include/builtin-boost/boost/preprocessor/control/detail/edg
- include/builtin-boost/boost/preprocessor/control/detail/msvc
- include/builtin-boost/boost/preprocessor/debug
- include/builtin-boost/boost/preprocessor/detail
- include/builtin-boost/boost/preprocessor/detail/dmc
- include/builtin-boost/boost/preprocessor/facilities
- include/builtin-boost/boost/preprocessor/iteration
- include/builtin-boost/boost/preprocessor/iteration/detail
- include/builtin-boost/boost/preprocessor/iteration/detail/bounds
- include/builtin-boost/boost/preprocessor/iteration/detail/iter
- include/builtin-boost/boost/preprocessor/list
- include/builtin-boost/boost/preprocessor/list/detail
- include/builtin-boost/boost/preprocessor/list/detail/dmc
- include/builtin-boost/boost/preprocessor/list/detail/edg
- include/builtin-boost/boost/preprocessor/logical
- include/builtin-boost/boost/preprocessor/punctuation
- include/builtin-boost/boost/preprocessor/repetition
- include/builtin-boost/boost/preprocessor/repetition/detail
- include/builtin-boost/boost/preprocessor/repetition/detail/dmc
- include/builtin-boost/boost/preprocessor/repetition/detail/edg
- include/builtin-boost/boost/preprocessor/repetition/detail/msvc
- include/builtin-boost/boost/preprocessor/selection
- include/builtin-boost/boost/preprocessor/seq
- include/builtin-boost/boost/preprocessor/seq/detail
- include/builtin-boost/boost/preprocessor/slot
- include/builtin-boost/boost/preprocessor/slot/detail
- include/builtin-boost/boost/preprocessor/tuple
- include/builtin-boost/boost/range
- include/builtin-boost/boost/range/detail
- include/builtin-boost/boost/range/detail/vc6
- include/builtin-boost/boost/serialization
- include/builtin-boost/boost/serialization/detail
- include/builtin-boost/boost/tuple
- include/builtin-boost/boost/tuple/detail
- include/builtin-boost/boost/type_traits
- include/builtin-boost/boost/type_traits/detail
- include/builtin-boost/boost/type_traits/msvc
- include/builtin-boost/boost/utility
- include/builtin-boost/boost/utility/detail
- src/Maps
- files modified:
- .gitignore
- 3rdparty/qttoolbardialog-2.2_1-opensource/configure *
- macos/mklocversion.sh *
- src/Layers/LicenseDisplayDialog.ui *
expand all
collapse all
added
removed
semperMerk/src/images/arrow_down_48.png
semperMerk/src/images/arrow_left_48.png
semperMerk/src/images/arrow_right_48.png
semperMerk/src/images/arrow_up_48.png
semperMerk/src/images/book_bookmark_48.png
semperMerk/src/images/edit-find-replace.png
semperMerk/src/images/edit-find.png
semperMerk/src/images/gear_48.png
semperMerk/src/images/go-down.png
semperMerk/src/images/go-next.png
semperMerk/src/images/go-previous.png
semperMerk/src/images/go-up.png
semperMerk/src/images/heart_48.png
semperMerk/src/images/list-add.png
semperMerk/src/images/list-remove.png
semperMerk/src/images/magnifier_48.png
semperMerk/src/images/minus_48.png
semperMerk/src/images/on_off_48.png
semperMerk/src/images/pencil_48.png
semperMerk/src/images/play_48.png
semperMerk/src/images/plus_48.png
semperMerk/src/images/process-stop.png
semperMerk/src/images/reload_48.png
semperMerk/src/images/star_48.png
semperMerk/src/images/stop_48.png
semperMerk/src/images/system-lock-screen.png
semperMerk/src/images/system-log-out.png
semperMerk/src/images/system-search.png
semperMerk/src/images/system-shutdown.png
semperMerk/src/images/tray_full_48.png
semperMerk/src/images/video_pause_48.png
semperMerk/src/images/video_stop_48.png
semperMerk/src/images/view-refresh.png
semperMerk/src/images/wifi_48.png
semperMerk/src/images/zoom-best-fit.png
semperMerk/src/images/zoom-original.png
semperMerk/src/images/zoom_in_48.png
semperMerk/src/images/zoom_out_48.png
semperMerk/src/resources/Merkaartor.svg
semperMerk/src/resources/btn_donate_LG.gif
semperMerk/src/resources/pixel.gif
semperMerk/src/resources/semperWeb - Copy.svg
semperMerk/src/resources/semperWeb-big.svg
semperMerk/src/resources/semperWeb.svg
semperMerk/src/resources/t_logo-a.png
