diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-06-24 19:13:33 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-06-24 19:13:33 +0300 |
| commit | a27ef72084d844ef703aaa9b1c6f4ec032ca182e (patch) | |
| tree | 6899419d1dbce9e5509f7eec3c0415a3de232464 /Software/Visual_Studio/PPC/Tango.PPC.Common | |
| parent | 7e77e5877a6ab6a03c672199fd3edbe9395e4c45 (diff) | |
| parent | 545f603c873cd026faf5560dae83da947f0a02a6 (diff) | |
| download | Tango-a27ef72084d844ef703aaa9b1c6f4ec032ca182e.tar.gz Tango-a27ef72084d844ef703aaa9b1c6f4ec032ca182e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml index 37e2d8074..2629c6a14 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml @@ -25,6 +25,7 @@ <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" /> <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" /> <converters:DateTimeUTCToShortDateConverter x:Key="DateTimeUTCToShortDateConverter" /> + <converters:MathOperatorConverter x:Key="MathOperatorConverter" /> </ResourceDictionary> </ResourceDictionary.MergedDictionaries> |