github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-28 14:22:47 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.conflicts

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14060 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-02-21 09:46:01 +00:00
parent d63cb2ee3f
commit f31ec20745
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,6 +1,10 @@
# Ultimate++
<<<<<<< HEAD
![alt text](uppbox/uppweb/Resources/Images/Logo.png?raw=true& "Ultimate++ Logo")
=======
![alt text](uppbox/uppweb/Resources/Images/Logo.png?raw=true "Ultimate++ Logo")
>>>>>>> Added logo to README.md
Ultimate++ is a C++ cross-platform rapid application development framework focused on programmers productivity. It includes a set of libraries (GUI, SQL, etc.), and an integrated development environment.