FlightGear - Flight Simulator FGAddon

FlightGear Flight Simulator: free open-source multiplatform flight sim

Brought to you by: curt, jmturner, stuartbuchanan, torstendreyer

• Summary
• Files
• Reviews
• Support
• Mailing Lists
• Tickets
• FlightGear Scenery
• External Link ▾
  • Forum
  • Wiki
  • Jenkins
• Git ▾
  • FGData
  • SimGear
  • FlightGear
  • FGMeta
  • FGRun
  • Getstart
  • MacLauncher
  • OpenRadar
  • SceneryWeb
  • More...
• FGAddon
• Docker
• FGAssets

Menu ▾ ▴

 

• Browse Commits
• Browse Files

Commit [r1242]  Maximize  Restore  History

CRJ700-Family: Rebase fixup. Things that did not work automatically.

Conflicts:
CRJ700-firstofficer-set.xml

From: Henning Stahlke <github@...>

Authored by: hamzaalloush 2015-12-02

Browse code at this revision

Parent: [r1241]

Child: [r1243]

changed	/trunk/Aircraft/CRJ700-family/CRJ700-firstofficer-set.xml
changed	/trunk/Aircraft/CRJ700-family/Models/Instruments/MCP/mcp.xml
changed	/trunk/Aircraft/CRJ700-family/Models/Instruments/SidePanel1/sidepanel.xml
changed	/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ700ER/LRL.png
changed	/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ700ER/SAL.png
changed	/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA-1.png
changed	/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA-2.png
changed	/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA-3.png
changed	/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA.png
changed	/trunk/Aircraft/CRJ700-family/splash.jpg

/trunk/Aircraft/CRJ700-family/CRJ700-firstofficer-set.xml Diff Switch to side-by-side view

/trunk/Aircraft/CRJ700-family/Models/Instruments/MCP/mcp.xml Diff Switch to side-by-side view

/trunk/Aircraft/CRJ700-family/Models/Instruments/SidePanel1/sidepanel.xml Diff Switch to side-by-side view

/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ700ER/LRL.png

Binary file was changed.

/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ700ER/SAL.png

Binary file was changed.

/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA-1.png

Binary file was changed.

/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA-2.png

Binary file was changed.

/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA-3.png

Binary file was changed.

/trunk/Aircraft/CRJ700-family/Models/Liveries/CRJ900/JZA.png

Binary file was changed.

/trunk/Aircraft/CRJ700-family/splash.jpg

Binary file was changed.